Update ceph to 0.87

Straightforward upgrade, with a couple of minor patches backported.