MX-1296, fix some log messages
Merge branch 'bugfixes/tokumx-2.0' into releases/tokumx-2.0