Merge proposals dependent on lp:~michael.nelson/charm-helpers/configure-sources-single-source-null-key

1. configure-sources-single-source-null-key
2. Dependent merge proposals