ARMS-285. puppet: updated for use with rpms.
Cleaned out redundant manifests.