Bug 967420 - Refactor to prepare for more task-manager/rocketbar branching