Additional puppet 3 template fixes.