Merge remote-tracking branch 'upstream/2.7.x'

• upstream/2.7.x: (22 commits) Removed duplication of compiling a catalog Cleaner test for create_resources doing nothing Fixing problem caused by activerecord Put back require 'puppet' in Puppet::Util (#13299) Fix error message when agent is disabled Update puppet.spec for rpm packaging Fixed old log test to match new autoflush behavior Make sure the log file writable Default autoflushing of log files to true Created test that shows enc warning problem (Maint) Fix order-dependent test failure (Maint) Don't assume eventlog gem is installed on Windows options[:ca_location] is a string not a symbol. Safer to pull Puppet::SSL::Host.ca_location since it is already set correctly. (#13204) Don't ignore missing PATH.augnew files (#13640) Only agents should use next_agent_run Increased test coverage of scoping rules Use more descriptive terms for the differing scopes Make new scoping look through inherited scopes Add tests for mixed inheritence/inclusion Remove dynamic option for lookupvar ...

Conflicts:
lib/puppet/defaults.rb
lib/puppet/parser/scope.rb
spec/unit/parser/functions/create_resources_spec.rb
spec/unit/parser/scope_spec.rb
spec/unit/resource/type_spec.rb
test/util/log.rb