(maint) Manual mergeup July 31 2023

* upstream/7.x:
  (PUP-11901) Skip should_query_all tests for 7.x

Author: mhashizume

acceptance/tests/resource/group/should_query_all.rb

@@ -1,5 +1,6 @@
 test_name "should query all groups"
 skip_test if agents.any? {|agent| agent['platform'] =~ /osx-12-arm64/ || agent['platform'] =~ /osx-13-arm64/  } # See PA-4555
+
 tag 'audit:high',
     'audit:refactor',   # Use block style `test_name`
     'audit:integration' # Does not modify system running test