Merge "Upgrade ceph-osd"