Bug 856947 - Fix dom/battery test to handle running on either battery or AC power. r=mounir
Bug 856440 - Push Notification startup regression. r=nsm

--HG--
extra : rebase_source : 5e56eddbab9a85c2a1fe7196e407a7b9d4c123d0