Merge pull request #8867 from joshcooper/merge_6x_jan26

(maint) Merge 6.x to main

Author: cthorn42

CODEOWNERS

@@ -1,5 +1,5 @@
 # defaults
-* @puppetlabs/phoenix @puppetlabs/puppetserver-maintainers @puppetlabs/night-s-watch
+* @puppetlabs/phoenix @puppetlabs/puppetserver-maintainers
 
 # PAL
 /lib/puppet/pal @puppetlabs/bolt