Merge "Allow IPv6 tests to be disabled"