Merge proposals dependent on lp:~ted/indicator-power/fix-settings3

lp:~ted/indicator-power/fix-settings3 has no merge proposals.