Merge "Add parameters to run k8s conformance during upgrades"