refs #743, change test to not invoke SERVER-11741
Merge branch 'bugfixes/tokumx-1.3'