refs #952, some bug fixes from previous checkins
Merge branch 'bugfixes/tokumx-1.4'