Removed puppetmaster and puppetversion from templates