Merge "Add job parameters required for Calico upgrade"