Merge proposals dependent on lp://staging/~chris.macnaughton/openstack-charm-testing/next-ceph-osd-bundle

1. next-ceph-osd-bundle
2. Dependent merge proposals