Automatic merge from submit-queue

Print a more helpful error message when failing to start rolling-updates

Hopefully this will help us track down where the 1.3 -> 1.4 upgrades are breaking down. We'll need to cherry-pick this into release-1.4 to have any effect, though.