Merge proposals dependent on lp://qastaging/~gnuoy/mojo/vault-charm-output-parse-fix

lp://qastaging/~gnuoy/mojo/vault-charm-output-parse-fix has no merge proposals.