548 backports

[eileenmcnaughton]

Overview

port
#23235
#23228
#23226
#23202

[civibot]

(Standard links)

• If this is your first pull-request for CiviCRM, please browse CONTRIBUTING.md for information about the development and testing processes.
• If you are reviewing this pull-request, you may wish to consult the test sites and the Review Standards (long template, short template).

[totten]

civibot, test this please

[totten]

The test failure here was due to a recent bug in the test-script. Specifically, it successfully ran most of the tests -- but then crashed near the end of the suite (namely, during phpunit-core-exts). I debugged the test script on this build, confirmed that the last two stages run now, and pushed up the fix. I'm going to merge because I don't really want to hold the release another 2 hours while it re-runs the parts of the test suite that already passed, twice.