Bug 912286 - Fix quickstarts and console prior to split

Bunch of cleanup