Prevent cat globbing if filenames contains wildcards
Puppet 2.6.x compatibility
Merge branch 'puppet_2_6_x_compat'

* puppet_2_6_x_compat:
  Puppet 2.6.x compatibility