Clean all warnings for puppet-lint gate

Change-Id: I292adf43bd434ca38d71baae6144e6ac4fea94a9
Merge "Clean all warnings for puppet-lint gate"