Merge "Proper fix for Ceph osd remove pipeline"