Merge tserver fixes with this branch.

FossilOrigin-Name: 58a0aab8fd5f5dcbec867468b7f4c1b67c3e16bbe3aeea6bd21ae6b04c2b93f1

diff --cc manifest
index 5234b14a433c17a28849d0fb8a967a8833383448,625a7e4e86d7af4c69f5f92cb6c779e7cb1caf29..61b6b176701ab3acdb73f4781c26cfdd5a52da97
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Support\sclients\swithin\sa\ssingle\sprocess\sonly.
- D 2017-06-27T20:23:07.577
 -C Fix\sbugs\sin\stest\sprogram\stserver.c.
 -D 2017-06-28T20:12:41.779
++C Merge\stserver\sfixes\swith\sthis\sbranch.
++D 2017-06-28T20:21:15.793
  F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 6a8c838220f7c00820e1fc0ac1bccaaa8e5676067e1dbfa1bafa7a4ffecf8ae6
@@@ -1585,10 -1585,7 +1585,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 d8568aacf083b63cdcf68d744ddb07a7615d14f169be6c632813a266a1e8a1cf
- R f783e0707b8d4ba7e92792e2decf35e1
- T *branch * server-process-edition
- T *sym-server-process-edition *
- T -sym-server-edition *
 -R fca1d20100f6bb2d0932053fa9b009ce
++P dfa9a4d53e0aa7f7911b11af57a4d37a1df2d835cf60eb9e76d28b6b39c2ba58 093b9108ea3532437683547c82f756df2413013a50a2fddad3d928cf8d74f9eb
++R 72b821ad7bad9e97d348feb666cadf11
  U dan
- Z c2e6e9d0d91d26e5c223f5dd53e51df2
 -Z abee9fae5ac9c5e9468404f3e0fbaf84
++Z d8120536ead40ef5709cd4556448f644

diff --cc manifest.uuid
index ffbe74199fcd6f9520a727fd201c124760662b4b,f8a03ca9d1a8e0dbf6d96d8d25faff46b47edb88..f2e21e8d12179c7a06c90bbc67a258ae9154ce25
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- dfa9a4d53e0aa7f7911b11af57a4d37a1df2d835cf60eb9e76d28b6b39c2ba58
 -093b9108ea3532437683547c82f756df2413013a50a2fddad3d928cf8d74f9eb
++58a0aab8fd5f5dcbec867468b7f4c1b67c3e16bbe3aeea6bd21ae6b04c2b93f1