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