Puppet manifest global vars

Merging Multiversion support into mainline