Ceph

Backport #41464

Updated by Nathan Cutler over 4 years ago

https://github.com/ceph/ceph/pull/30979 

 and 

 https://github.com/ceph/ceph/pull/31659

Back