Merge remote-tracking branch 'upstream/2.7.x' into 3.0.x
- upstream/2.7.x: (#17260) Include link to information about deprecation Update Rakefile to make rspec optional Remove the asc file from the source of spec file (#17260) Warn when variables contain hyphens Edit description of hyphenated variables compatibility setting (#10146) - in variable names should be deprecated! (#14822) Use feature confine for feature tests during run (#14822) Re-evaluate features if they previously were false
Conflicts:
ext/build_defaults.yaml
ext/redhat/puppet.spec.erb
lib/puppet/defaults.rb