Merge remote-tracking branch 'upstream/2.7.x'
- upstream/2.7.x: Apply commit from master that varies ports during tests (#8174) Allow defines to reference topscope Evaluate node classes either in top or node scope Removed topscope being overridden by node Update CHANGELOG lib/puppet.rb puppet.spec for 2.7.15rc1
Conflicts:
acceptance/tests/language/node_overrides_topscope_when_using_enc.rb
lib/puppet.rb
spec/integration/network/server/mongrel_spec.rb
spec/unit/parser/scope_spec.rb