refs #953, make small code review fixes
Merge branch 'bugfixes/tokumx-1.4' into releases/tokumx-1.4