Rebase puppet-ceph to e72b6f to pull in current version
*** This bug has been marked as a duplicate of bug 1479548 ***