Merge proposals dependent on lp:~johnsca/charm-helpers/services-docker

lp:~johnsca/charm-helpers/services-docker has no merge proposals.