Partial-Bug: #1397496
More changes for modularizing puppet modules.

Change-Id: If242de5650048d240410c7a99b5b8fa50256f8cf
Merge "Partial-Bug: #1397496 More changes for modularizing puppet modules."