Merge proposals dependent on lp:~james-page/charm-helpers/fix_hookenv_misc

lp:~james-page/charm-helpers/fix_hookenv_misc has no merge proposals.