Changes so these are not installed and still removed
Merge pull request #245 from ceph/wip-remove-salt

Changes so these are not installed and still removed