updated templates to fix deprecation Warning in Puppet 3.2.2
Merge branch 'master' of https://github.com/mohamedhadrouj-vv/puppetlabs-apache