refs #660, make an alternate fix to SERVER-9283
Merge branch 'bugfixes/tokumx-1.3'