Bug 836875 - Background is no longer painted in Print output/Print preview, r=roc
Merge m-c to inbound.
Backed out changeset 2861ef67390a (bug 837566) for Linux32 mochitest-other shutdown hangs.
Bug 838124 - Convert BatteryManager to WebIDL. r=peterv