abort cleanup and minor style fixes
remove unnecessary mesosScheduler variable
cleanup merge
styling
Merge remote-tracking branch 'upstream/hs_guice_changes' into guice-changes
Use a provider to sling the server around.