Fix variable template puppet deprecation warnings