Merge "Split common pre-setup code out of WebStart/doMaintenance"