Merge proposals dependent on lp://qastaging/~james-page/openstack-charm-testing/add-key-override

1. add-key-override
2. Dependent merge proposals