fix puppetinstall
Merge remote-tracking branch 'origin/master' into openstack-docker