Merging fixes @rgevaert in template for older puppet versions