Updating various module templates to conform with puppet 3.2 requirements.