The man page updater wasn't making man pages for the new Faces app. This commit
gives it that capability, and handles the name collision on puppet resource.

Reviewed-By: Nick Lewis <nick@puppetlabs.com>

* 2.6.x:
  (#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.

This will prevent committers to forget to write cover letter subject
when rake mail_patches needs to send multiple e-mails.
It defaults to the "type" and "branch name" of the patch-set.

Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>

Once the futils area of the Rakefile was fixed, running `rake spec`
turned up this problem.

ftools is used in the rake gem rasks. It is deprecated in
Ruby 1.9.x and so we've replaced it with FileUtils.

This was a particularly nasty merge, so rather than hold up merges into
next any longer, I'm going to push this merge with a few outstanding
problems.  The tests that were failing in the following areas have been
marked pending, and will be addressed separately, immediately following
this push.

TODO:
Verify that brice's rdoc change is still valid: tests to show that line
  numbers from class, define and node get into the ast
Fix mount parsed_spec spec/unit/provider/mount/parsed_spec.rb

* 2.6.next: (85 commits)
  (#5148) Fix failing spec due to timezone
  (#5148) Add support for PSON to facts
  (#6338) Remove inventory indirection, and move to facts indirection
  (#6445) Fix inline docs: puppet agent does not accept --mkusers
  Update CHANGELOG and version for 2.6.6rc1
  (#6541) Fix content with checksum truncation bug
  (#6418) Recursive files shouldn't be audited
  (#6541) maint: whitespace cleanup on the file integration spec
  (#6541) Fix content with checksum truncation bug
  (#5466) Write specs for output of puppet resource
  (#5466) Monkey patch Symbol so that you can sort them
  (#5466) Fixed puppet resource bug with trailing ,
  Update CHANGELOG for 2.6.5
  (#4922) Don't truncate remotely-sourced files on 404
  (#6338) Remove unused version control tags
  Maint: Align tabs in a code block in the Augeas type.
  (#6509) Inline docs: Fix erroneous code block in directoryservice provider for computer type
  Maint: Rewrite comments about symlinks to reflect best practice.
  (#6509) Inline docs: Fix broken lists in Launchd provider.
  (#6509) Inline docs: Fix broken code blocks in zpool type
  ...

Manually Resolved Conflicts:
  lib/puppet/application/inspect.rb
  lib/puppet/defaults.rb
  lib/puppet/file_bucket/dipper.rb
  lib/puppet/network/http/handler.rb
  lib/puppet/node/facts.rb
  lib/puppet/parser/parser.rb
  lib/puppet/parser/parser_support.rb
  lib/puppet/util/command_line/puppet
  lib/puppet/util/command_line/puppetd
  lib/puppet/util/command_line/puppetmasterd
  lib/puppet/util/monkey_patches.rb
  lib/puppet/util/rdoc/parser.rb
  spec/unit/application/agent_spec.rb
  spec/unit/file_bucket/file_spec.rb
  spec/unit/indirector/file_bucket_file/file_spec.rb
  spec/unit/network/http/handler_spec.rb
  spec/unit/parser/parser_spec.rb
  spec/unit/provider/mount/parsed_spec.rb

Entire series:
paired-with: Daniel Pittman <daniel@puppetlabs.com>
paired-with: Paul Berry <paul@puppetlabs.com>

The manpage generator can now make manpages for the modern executable in
addition to the legacy executables. The section for the legacy
names should be deleted upon the release of 2.8.0.

Having this be commented-out code in the installer script doesn't really
make sense for our workflow; we want to be able to regenerate these manpages at will
and make sure they're always up-to-date. This will help us keep them in sync with the help text.

This commit also changes the ronn invocation to specify a manual name and organization.