Cherry pick from #63 - battstat applet: ready for upower-1.0
Cherry pick from #64 - https://github.com/mate-desktop/mate-applets/pull/64