Change-Id: I581efd7c0d138cb78ab3afd755521f3fb375c0ee Partially-Implements: blueprint ceph-improvements