Use devel branch of install-puppet for now.
Merge branch 'devel' of cworld.local:product-setup into devel