Merge branch '2.6.next' into 2.6.x

• 2.6.next: (23 commits) (#5908) Add support for new update-rc.d disable API (#6862) Add a default subject for the mail_patches rake task Fixed #6256 - Creation of rrd directory. (#5477) Allow watch_file to watch non-existent files, especially site.pp (#5221) Add test for fix to fileset with trailing separator (#5221) Fix fileset path absoluteness checking with trailing slash (#4769) Fix negative timeout support for newer rubies Fixed #6562 - Minor kick documentation fix (#6658) Propagate ENC connection errors to the agent (#4884) Remove typo from spec test (#4884) Modify tests to pass on non-OS X systems (#4884) Revise new exec tests, add a few more (4576) - if ENC declares invalid class, it is logged at warning. (#4884) Add an shell provider for execs (#4884) Fix Test::Unit exec tests (#4884) Break the exec type out to have a posix provider (#4884) Add consistent path validation and behavior (#4884) Add expand_path to requiring the spec_helper (#4884) Autorequire shared behaviors and method to silence warnings (#4884) Fix whitespace ...