Merge pull request #959 from rubenk/fix-ceph-plugin