More fixes.  This may actually result in a fix for #2285 but #2284 is blocking the fix. Refs #2285, [t:2285]

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