Merge "Ensure upgrade step orchestration accross roles."