Merge trunk bug/test fixes

FossilOrigin-Name: 830b0b1c49aaca53a40e5a4ca9a11351d697a980c7bf80379e32f0646738d566

diff --cc manifest
index 15c70391854b3d0f1eec9f810354423204478be3,bb5e1dc3880a7fed80fc2bbf72e9f887124320e6..8495572bd83b11cd75744ee8bcbea210f9f5c2ed
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sfrom\strunk.
- D 2021-04-16T23:53:07.986
 -C Bring\sin\spermutations\smod.
 -D 2021-04-17T20:04:40.828
++C Merge\strunk\sbug/test\sfixes
++D 2021-04-17T20:13:35.774
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -1912,8 -1913,7 +1913,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P d762784a46946c5a5d565d7ef8ae243703eb38eb71d6101a7f2ed6d22eff1c53 23da5016b66f3947cc902dbe2766ea9f5a00f85312a652b536ab51d657446ab7
- Q +23da5016b66f3947cc902dbe2766ea9f5a00f85312a652b536ab51d657446ab7
- R 083e0cd2e75a733d6e513853bdd8d74c
 -P f0dd9cf2d7045d3634294bcf2722d3d7b0a6c4c3ef713b0f7f54fbe31432027f 9f5f16cf093cd8b8c7649f664eaf2ad8128fd50e182720dbddf05a6d9227c037
 -R 87aec11a4649f0fdf92c1e3a7b1989d4
++P 43894f0b5b4f000a929052bc32822d704d25d139375362fad77f8824b5aad456 7a1316f32c857b5ec9e50c5d341f977f998dbf404f4758e3fe317fd8ef25f41e
++R ac7ec3da64201d525f8a56c1d9e2eccc
  U larrybr
- Z fb7a3052f7a76da1a46a8c9f66d60715
 -Z 0c46d5306f1cd3c2e7d5358adc5fc62f
++Z b4aa6186b2ea674eba41229f5aa10ae8

diff --cc manifest.uuid
index bd57b26da3f8c5a1719c50fc22d82f29fb3baade,cd3456b968d8cb5cbd5f840686676595d187b11e..28081ace4fe2d7fa38cde67f05ea78733e700f93
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 43894f0b5b4f000a929052bc32822d704d25d139375362fad77f8824b5aad456
 -7a1316f32c857b5ec9e50c5d341f977f998dbf404f4758e3fe317fd8ef25f41e
++830b0b1c49aaca53a40e5a4ca9a11351d697a980c7bf80379e32f0646738d566