[Merge] lp:~tribaal/ubuntu/trusty/ceph/add-zap-fix-patch into lp:ubuntu/trusty/ceph

[Chris Glass]

Note: This diff is against the version in trusty - but it should really target the version in trusty-proposed.
-- 
https://code.launchpad.net/~tribaal/ubuntu/trusty/ceph/add-zap-fix-patch/+merge/267350
Your team Ubuntu branches is requested to review the proposed merge of lp:~tribaal/ubuntu/trusty/ceph/add-zap-fix-patch into lp:ubuntu/trusty/ceph.