Merge "Actually start the systemd services in step3 of the major-upgrade step"