PSMDB release

Merge pull request #340 from tplavcic/tokudb-fixes

Contributed fixes from bugs #1510085 and #1510092