puppet: lint cleanup

Change-Id: I9d2c5a2007ed6f4ef694f110011e32b3b7e4c821
Merge "puppet: lint cleanup" into production