changes to puppet-git merged upstream, let's use them again ...