(Squash) Cleanup intra-PR conflicts

(Squash) Cleanup intra-PR conflicts

The original commits that are squashed here:

commit 1d6f386b6c4ddb8a21a09520d3326a72039b04bd
Merge: bd969852b8 b0b92b3a5a
Author: Rich Lott / Artful Robot <code.commits@artfulrobot.uk>
Date:   Mon Feb 20 12:02:41 2023 +0000

    Merge remote-tracking branch 'origin/artfulrobot-standalone' into artfulrobot-standalone

commit bd969852b808e599fccad7843dd8aa58ee3c28cd
Author: Rich Lott / Artful Robot <code.commits@artfulrobot.uk>
Date:   Mon Feb 20 12:01:11 2023 +0000

    standalone: delegate most of CRM_Utils_System_Standalone to extension

commit b0b92b3a5a019561758ef894d43b1a8853b1dd5f
Author: Klaas Eikelboom <klaas.eikelboom@civicoop.org>
Date:   Mon Feb 13 22:53:30 2023 +0100

    Civilint