Merge proposals dependent on lp:~ost-maintainers/openstack-mojo-specs/mojo-test-charmhelper-upgrade

1. mojo-test-charmhelper-upgrade
2. Dependent merge proposals