Merge "ceph upgrade fix"