2.7.0r4

Merge branch 'next'

* next:
  (puppetlabs#7101) Fix template error messages in Ruby 1.8.5
  (puppetlabs#3420) Nagios "name" attribute does not output correctly
  (puppetlabs#4487) When setting environment on a host, ensure it is a string.
  add test for ticket 7101
  add test for ticket 7101
  (puppetlabs#7220) Add the ability to "inherit" options.
  (puppetlabs#6487) Add some testing for OS X version support in DirectoryService provider
  (puppetlabs#6487) Directoryservice provider will fail in future OS releases
  (puppetlabs#6368) Make the File type autorequire its nearest ancestor directory