DB-755 speed up 5585.test
Merge branch 'master' into releases/tokudb-7.5