Fix location of puppet binary, always /usr/bin/puppet
Merge branch 'master' into develop