Merge "Disable VIPs before stopping cluster during version upgrade"