Fixed puppet-lint issues for the new code and for some part of the old code