(maint) Manual mergeup July 31 2023

[mhashizume]

In CI, automatic mergeup from 7.x to main failed with this:

14:24:26 fatal: Exiting because of an unresolved conflict.
14:24:26 U	acceptance/tests/resource/group/should_query_all.rb
14:24:27 + echo 'Couldn'\''t automatically resolve conflicts while merging 5baa68a4c22c0fa16d98696072cca38690611033 into main; Merge-up must be done manually.'

This was due to a newline existing in should_query_all.rb in 7.x, but not main.