Merge proposals dependent on lp://qastaging/~ev/ubuntu-ci-services-itself/charms-in-config-manager

1. charms-in-config-manager
2. Dependent merge proposals