Merge "Fix IPv6 tests if ipv6-private-subnet is stateless"