Merge tag 'v2.3.18' into testing

diff --cc sdk/branches/testing.bnd
index 7dba24cb4b50172d8a0e3d4105dd993da652e542,0000000000000000000000000000000000000000..c4fe67f0dfac66e1553aabf836a4917a1458b947
mode 100644,000000..100644
--- 1/sdk/branches/testing.bnd
--- /dev/null
+++ b/sdk/branches/testing.bnd
@@@ -1,4 -1,0 +1,13 @@@
 +major=2
 +minor=1
 +micro=112
 +qualifier=.next
++
++Bundle-Copyright= \
++Copyright 2007-2023 Mathieu Baudier, \
++Copyright 2012-2023 Argeo GmbH
++
++SPDX-License-Identifier= \
++LGPL-2.1-or-later \
++OR EPL-2.0 \
++OR LicenseRef-argeo2-GPL-2.0-or-later-with-EPL-and-JCR-permissions