Merge "Move ipv6 config option into network-feature-enabled"