(maint) Switch from -fd to -fp for specs to reduce disk space usage
Revert "Add initial support for building in a RHEL 7 mock"

This reverts commit b471b9d2a37ca10d0d20c294e813b5a46e6cabd9.
Merge pull request #2353 from melissaanne/maint/stable/revert-el7-mock

Revert "Add initial support for building in a RHEL 7 mock"
(PUP-751) Check for reparse once per compile

Previously, whenever the known_resource_types
(Puppet::Resource::TypeCollection) was retrieved from the
environment it would check if there were any files that needed to be
reparsed. If any files needed a reparse, then the entire TypeCollection
was thrown away and redone.

In most cases the reparse check did not need to touch the filesystem
because the Puppet::Util::PeriodicWatcher would return a cached result
until the filetimeout had expired. Unfortunately the check was done so
often that the overhead of simply checking if enough time had passed
caused it to take a considerable amount of time.

This changes it so that the environment's known resource types are only
recalculated if the new check_for_reparse method determines that it
should. The new method is only called at the beginning of a compile and
so the files will never be checked while a compilation is being
executed.
(maint) Backport benchmarking from 3.5 to 3.4.2

This backports the bechmarking from Puppet "3.5.0" (i.e. master)
to 3.4.2 and modifies the many_modules benchmark to not use lookup
to get the "benchmarking" environment.
(maint) Make benchmark:defined_types work on 3.4.2

This changes the use of lookup to creating an Environment.
(maint) Set required conf parameters to make benchmarks do something

The backport did not consider that environments needed to be configured
differently than for the new env support in 3.5.
Merge pull request #2356 from hlindberg/maint_add-benchmarking-to-stable

(PUP-751) Add benchmarking to stable
Merge pull request #2355 from zaphod42/issue/stable/pup-751-backport-performance-fix-to-stable

(PUP-751) Check for reparse once per compile
Merge remote-tracking branch 'upstream/stable'

* upstream/stable:
  (maint) Set required conf parameters to make benchmarks do something
  (maint) Make benchmark:defined_types work on 3.4.2
  (maint) Backport benchmarking from 3.5 to 3.4.2
  (PUP-751) Check for reparse once per compile
  Revert "Add initial support for building in a RHEL 7 mock"
  (maint) Switch from -fd to -fp for specs to reduce disk space usage

Conflicts:
	benchmarks/defined_types/benchmarker.rb
	benchmarks/defined_types/puppet.conf.erb
	benchmarks/many_modules/benchmarker.rb
	benchmarks/many_modules/puppet.conf.erb
	ext/build_defaults.yaml
	lib/puppet/indirector/resource_type/parser.rb
	lib/puppet/node/environment.rb
	spec/unit/node/environment_spec.rb