Merge "Follow devstack-plugin-ceph job rename"