updated templates and modules to fix deprecated warnings for new puppet