fixes more issues with rhel7 support

This new pull request fixes the merge issues with the previous one found here, https://github.com/ceph/ceph-deploy/pull/204