Merge proposals dependent on lp:~yolanda.robla/charm-helpers/fix_add_source

lp:~yolanda.robla/charm-helpers/fix_add_source has no merge proposals.