(PUP-2561) Fix spec test on windows
Merge branch 'pr/2650' into stable

* pr/2650:
  (PUP-2561) Fix spec test on windows
Merge remote-tracking branch 'upstream/stable'

* upstream/stable:
  (PUP-2561) Fix spec test on windows
Merge branch 'master' of https://github.com/puppetlabs/puppet