Merge proposals dependent on lp:~stub/charm-helpers/fix-gpg

lp:~stub/charm-helpers/fix-gpg has no merge proposals.