Merge "N->O upgrade, blanks ipv6 rules before activating it." into stable/ocata