refs #485 Clean up a bit
Merge branch 'bugs/485' into releases/tokumx-1.2
tokumx-1.2.0-rc.2