Merge 88595 - Revert 88545 - Revert 88470 (broke ServiceProcessStateTest.ForceShutdown on CrOS) -...

Merge 88595 - Revert 88545 - Revert 88470 (broke ServiceProcessStateTest.ForceShutdown on CrOS) - Fix for system version unit tests in cros.
Unit test the revert was to fix is still failing after the revert. Also confirmed that the failing test has nothing to do with this CL.

BUG=chromium-os:15789
TEST=Ran try servers to make sure the unit test is not failing anymore, plus viewed all the screens and took screenshots. Screen shots of all effected screens are attached to the cros bug
TBR=rkc@chromium.org

TBR=rkc@chromium.org
Review URL: http://codereview.chromium.org/7044086

TBR=thakis@chromium.org
Review URL: http://codereview.chromium.org/7044097

TBR=rkc@chromium.org
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=89115