a bunch of little fixes all over the damned place
undo changes to rolling upgrades doc due to already existing PR