Merge proposals dependent on lp://qastaging/~gabor.meszaros/openstack-charm-testing/multi-az-multi-ceph-fixes

1. multi-az-multi-ceph-fixes
2. Dependent merge proposals