Merge pull request #2226 from ceph/cv-drop-pacific