This patch also renames names of variables in tests of the cluster_upgrade extension from more specific names that contain versions of releases to least specific names. Change-Id: Ic02b4426c1bb0bf38ba06cfeb54255043ebc8481 Closes-Bug: #1555339