More fixes for ceph-disk

More fixes fro ceph-disk from wip-ceph-disk branch (from pull request #117 )