puppetmaster - lint fixes

Change-Id: I3fd551d0ef7b4825801d2e6c809f6a58e623ed66
Merge "puppetmaster - lint fixes" into production