Iteration-2011-04-27-master: Merge branch 'next'

@MaxMartin MaxMartin tagged this Apr 27, 2011 · 1102 commits to master since this tag

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