Merge enhancements from trunk, especially the CLI fixes.

FossilOrigin-Name: a350040a3bb962823f92908fb31cade52baf13eab90ef608ca3a8349e4c28c9d

diff --cc manifest
index bf8c2873b85a2b1c418415be45b0b927126b451e,8659a25d5b7ef5d68ebab32fb4d3e1949766888b..707ba67441296ef743b82520b67090f19cdb2c79
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Avoid\sunnecessary\ssqlite3_finalize()\soperations.
- D 2018-05-18T16:53:07.242
 -C In\sthe\sCLI,\sdetect\sand\sreport\serrors\son\ssqlite3_close().\s\sClear\sglobal\nvariables\sprior\sto\sexit\sto\sso\sthat\svalgrind\scan\sbetter\sdetect\sresource\nleaks.
 -D 2018-05-18T17:11:50.887
++C Merge\senhancements\sfrom\strunk,\sespecially\sthe\sCLI\sfixes.
++D 2018-05-18T17:17:36.604
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F Makefile.in bfc40f350586923e0419d2ea4b559c37ec10ee4b6e210e08c14401f8e340f0da
@@@ -1729,7 -1728,7 +1729,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 95fd296ffc8130526a1453cbdca6ce47f22fc5b5c474aa31d66b627d0c7393a1
- R 2d7f80f5a8cb7985e7256646130cf7be
 -P 5139ea62a8a6c6dc6558c337de39bcbadd26f6515742263387be03c862c78cf0
 -R b8765ab2a09ad6fd3afc8344422cf1a3
++P 16f71032a3a2919cb226b25b5256a370adb5c55fa506d4774b7f83dc8868e793 e3b2e0a078b82ac6cd3c3312e8ac0983c1375e1052f1e324476d2f8d1b227c30
++R c67fcd3e8c429daa0c0bf5aeb356dbf0
  U drh
- Z 143ebe5c5507b367bd6154b3294d97b7
 -Z d089a713f2ba352bce4662bcdd3c7d90
++Z 66b7d64381807f753032bf250835a757

diff --cc manifest.uuid
index 643e5a132529b67e9bd8db45a4e8fbf428744b1c,0b799613c0e7faee8190aaa6ab2d68fa1196c1e8..ce4a1dd5d04c202bc9880bf5f8507610a09ee40e
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 16f71032a3a2919cb226b25b5256a370adb5c55fa506d4774b7f83dc8868e793
 -e3b2e0a078b82ac6cd3c3312e8ac0983c1375e1052f1e324476d2f8d1b227c30
++a350040a3bb962823f92908fb31cade52baf13eab90ef608ca3a8349e4c28c9d