Sync w/trunk prior to merge back.

FossilOrigin-Name: 2d290854cd9b6cef70b53c28745e1ccee5b5443378407bfc726e452e7e7a0a95

diff --cc manifest
index 30e935a72ccf9ed59bfa4c6e9536294dba773f56,6f9c60806776feff3ddec31e3e1a24b91c2fe629..03f20a81fb2ec679a44d9875e65f3a499395efae
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Give\sexpert\sability\sto\sdeal\swith\scustom\scollations.
- D 2023-09-24T19:00:00.954
 -C Resolve\sthe\sJNI\sFTS5\stest5()\sfailure\sand\sremove\ssome\snearby\sdead\scode.
 -D 2023-09-24T19:13:31.100
++C Sync\sw/trunk\sprior\sto\smerge\sback.
++D 2023-09-24T19:28:07.223
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -2121,8 -2121,8 +2121,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 3406b05b4f57901f64f9b5fc83fe0250b827ae7f342c2026818dab0840aafd23
- R 4fd35ee51e3295c4798887f6f81483f9
 -P b5edea16317ccc896394011f45442af44d5ea1041b6abfe152c90412c78bfc5b
 -R e953b1803753c8b191ad714c0d30fec2
 -U stephan
 -Z 3ee8d5bd34ec986d01785356a75c837f
++P ac1dc1b6ded0e43acb5b2b707110f767f7bdb5cecdb6b28a982db174ae233d37 5655c51f103c6dfade799ffb5ca2eb21b4360ada598741f373c952ae732535aa
++R c809056d639a53309bb20431f25032cd
 +U larrybr
- Z 0102b81fd083e10463436403edc18206
++Z 558957f713166e500314661df03f2a3f
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index 874ad43499fc93557c8853149d08117d7ba74aaa,c67f420d3ce900a1eee818b405804a1e21782524..4ab25438cd27cabb08235097dcec7620f45111f3
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- ac1dc1b6ded0e43acb5b2b707110f767f7bdb5cecdb6b28a982db174ae233d37
 -5655c51f103c6dfade799ffb5ca2eb21b4360ada598741f373c952ae732535aa
++2d290854cd9b6cef70b53c28745e1ccee5b5443378407bfc726e452e7e7a0a95