Merge remote-tracking branch 'pcarlisle/ticket/20308-file-serving-recursion' into stable

* pcarlisle/ticket/20308-file-serving-recursion:
  (#20308) Clean up the fileset specs
  (#20308) Refactor fileset recursion for clarity
  (#20308) Fix dropping paths from fileset results
  (#20308) Make more of Fileset private
  (#20308) Add failing test for incomplete file list
(#20308) Fix fileset spec for Windows
(#20308) Try again to fix fileset tests on Windows
Revert "Merge branch 'nicklewis-rcS-is-a-jerk' into stable"

This reverts commit ea548f68bac581d1d0a2e2e95738d73f658b3896, reversing
changes made to d6e6e9d51a92cba2e5dcace4b48949d1f77663b9.

Reverting because the acceptance tests is failing :(

https://jenkins.puppetlabs.com/view/Puppet%20FOSS/view/Master/job/Puppet%20Acceptance%20(master)/label=acceptance,platform=centos/767/console
Merge branch 'stable'

* stable:
  Revert "Merge branch 'nicklewis-rcS-is-a-jerk' into stable"
  (#20308) Try again to fix fileset tests on Windows
  (#20308) Fix fileset spec for Windows
Merge branch 'master' of https://github.com/puppetlabs/puppet