Revert "Closes-bug: #1397496 - Packaging changes for new puppet modules and Smgr changes"

This reverts commit 3d12a6137aa5762cab2095d00925b99981e03f26
Merge "Revert "Closes-bug: #1397496 - Packaging changes for new puppet modules and Smgr changes""