* 2.6.x:
  Reset indirector state after configurer tests.
  (#8770) Don't fail to set supplementary groups when changing user to root
  (#8770) Always fully drop privileges when changing user
  (#8662) Migrate suidmanager test case to rspec
  (#8740) Do not enumerate files in the root directory.
  (#3553) Explain that cron resources require time attributes

Conflicts:
	lib/puppet/application/resource.rb
	test/puppet/tc_suidmanager.rb

* 2.7.x: (25 commits)
  (#4411) Explain that runinterval = 0 does not mean "never run"
  Maint: Fix missing option text in puppet agent and arrange options alphabetically
  (#8302) Improve documentation of exec providers
  (#7853) Clarify and complete docs for the tagmail report processor
  Maint: Mention that audit metaparameter will accept "all"
  Maint: Adjust wording for file type's content parameter
  Maint: Fix poor documentation for versioncmp function.
  maint: Fix case sensitive require
  maint: Add inspect app options to help
  maint: Fix inspect help
  Increment lib/puppet.rb VERSION string
  Updated CHANGELOG for 2.7.3rc1
  (#4762) Ensure that clients on the moon can successfully connect.
  Add document outlining preferred contribution methods
  Add document outlining preferred contribution methods
  Add document outlining preferred contribution methods
  Revert "Merge branch 'vcsrepo'"
  Revert "Merge branch 'vcsrepo'"
  Updating CHANGELOG for 2.7.2rc3
  (#8704) Give better errors for invalid fileserver.conf
  ...

Manually Resolved Conflicts:
	lib/puppet/parser/functions/versioncmp.rb
	spec/integration/node/facts_spec.rb

Previously the command 'puppet resource file' would enumerate all files
in the root directory, and generate an exception if the file type was
not a directory, file, or link. Worse, it would also do this when a file
or directory was specified, e.g. 'puppet resource file /etc/hosts'.

Ideally, the find method of the ral terminus should not need to call the
type's instances class method, instead just creating an instance of the
type with the specified name and parameters. However, some types, like
package, depend on this behavior. The type walks all providers and all
instances that they provide, checking to see if the provider provides an
instance with that name, and also warning if another provider provides
an instance with the same name.

Also, ideally, puppet should not blow up when encountering an
unsupported file type, e.g. Unix domain socket, but that would be too
big of a change for 2.6.x.

This commit changes 'puppet resource file' to return a message saying
that the operation is not supported:

    Listing all file instances is not supported.  Please specify a file
    or directory, e.g. puppet resource file /etc

The change is bit of a hack, as ideally, the file type's instances
method could raise an exception when called in a 'search' context, but
return an empty array in a 'find' context. But that also would be too
big of a change for 2.6.x.

This commit also adds spec tests for the resource application and file
type, as well as an acceptance test, which creates a Unix domain socket
in the root directory, while running 'puppet resource file'.

Paired-with: Nick Lewis <nick@puppetlabs.com>
Reviewed-by: Jacob Helwig <jacob@puppetlabs.com>

Puppet agent's man text was missing the --no-client option in its command
synopsis, and the long text for --no-client cut off weirdly in the middle of a
sentence. This commit fixes both problems, and arranges all the options
alphabetically so they're easier to reference.

Inspect wasn't documenting the only two options it has, archive_files
and archive_file_server.  Now it does.

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

* 2.7.x:
  maint: Suggest where to start troubleshooting SSL error message
  maint: Fix cert app to print help and exit if no subcommand

* ticket/2.7.x/maint-show_help_for_cert_without_subcommand:
  maint: Fix cert app to print help and exit if no subcommand

Conflicts:
	lib/puppet/type/file/source.rb
	spec/unit/resource/catalog_spec.rb