closes #944, make oplog_upgrade.js more stable
Merge branch 'bugfixes/tokumx-1.4' into releases/tokumx-1.4