admin: puppet lint fixes

Change-Id: I809afb19a74926f303ebb47bc128fcf2a76f3d96
Merge "admin: puppet lint fixes" into production