Merge "Update conformance test to support k8s 1.16"

No match.