fixed some more tests, increased timeout for queryoptimizer3 #869
Merge branch 'bugfixes/tokumx-1.3' into releases/tokumx-1.3