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

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