Merge proposals dependent on lp:~gnuoy/charm-helpers/rename-extensions

lp:~gnuoy/charm-helpers/rename-extensions has no merge proposals.