(maint) Use with_puppet_running_on in backported cve tests.
Merge branch 'master' of https://github.com/puppetlabs/puppet