Merge updates from trunk.

FossilOrigin-Name: 8b42b8e31af03e82c091d4585d03f4edf49c0af9

diff --cc manifest
index c00f3abc4a8919c5ed31cfeed1310f8f80d848f6,d943af780403dcf9244e8eed897847a897ceff1c..685e7fef9f38d229db2c15e810f2182976283c4c
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Attempt\sto\sdetect\sphysical\ssector\ssizes\son\sWindows\sVista\sand\shigher.
- D 2017-01-12T23:37:52.534
 -C Fix\sa\sproblem\spreventing\sresumption\sof\sRBU\soperations\safter\srecovering\sfrom\sa\nprocess\sor\ssystem\sfailure\sthat\soccurs\sduring\sthe\sincremental-checkpoint\sphase.
 -D 2017-01-13T18:24:37.297
++C Merge\supdates\sfrom\strunk.
++D 2017-01-13T22:21:39.681
  F Makefile.in 41bd4cad981487345c4a84081074bcdb876e4b2e
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
@@@ -1543,7 -1545,7 +1545,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 381fd34b97ffe14f4bb784a9aae74477af699a08
- R 38a73ae0f111c05298e6affd34726ac4
 -P 8c85b8fdd7f0ba65fba83361d361a567b797a184
 -R dc62936e86267740ae9736f88160b05f
 -U dan
 -Z f2366ce5ecd39574b5b5eb81b3b99a63
++P 6e388423c492c52aef221bd14f66482e0365d86d 97914266cb4ec63b0c9185ab139673139bd2f0ed
++R f0d2b77c6b50a6ed012f904a1192a950
 +U mistachkin
- Z 05bcbcf820c10856a01bad7c2d3d9e2a
++Z 65e45b71c22d7b500900d481cc9e7fd9

diff --cc manifest.uuid
index be64045ecee2b1dd8e94706c8956e0a949788bad,e44a5e66076f1bbfe26f80bbd1d43e8d5bcc62bc..00503af2ca99f86e4aae475eb1780957ab25057e
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 6e388423c492c52aef221bd14f66482e0365d86d
 -97914266cb4ec63b0c9185ab139673139bd2f0ed
++8b42b8e31af03e82c091d4585d03f4edf49c0af9