Merge proposals dependent on lp:~abentley/charmworld/refactor-ingest

lp:~abentley/charmworld/refactor-ingest has no merge proposals.