Merge proposals dependent on lp:~tribaal/charm-helpers/update-before-install

lp:~tribaal/charm-helpers/update-before-install has no merge proposals.