Bug 924233 - Fix broken unit test in system
Merge pull request #12728 from alivedise/bugzilla/924233_master/bm_test_fail

Bug 924233 - Fix Battery manager unit test r=etienne