Merge "Revert "Consolidate parts of WebStart.php and doMaintenance.php into Initializ...