close[t:4269] Merge 4269 fixes to main. {{{svn merge -r38251:38424 ../tokudb.4269}}}.  Closes #4269.

git-svn-id: file:///svn/toku/tokudb@38438 c7de825b-a66e-492c-adef-691d508d4ae1