Merge "Change defaults for kubernetes upgrade job"