Merge proposals dependent on lp://staging/~openstack-charm-testers/openstack-charm-testing/openstack-monitoring

1. openstack-monitoring
2. Dependent merge proposals