Merge "Fix functest k8s job"