Merge proposals dependent on lp:~oddbloke/charms/trusty/ci-configurator/multiple_config_dirs

lp:~oddbloke/charms/trusty/ci-configurator/multiple_config_dirs has no merge proposals.