Fixes for deprecation warnings

This fixes a couple of deprecation warnings with recent versions of puppet and the concat module.