Address various libceph merge conflicts.