Fix puppet-lint issues
Merge branch 'master' into add_manage_user