made test skipping output TAP-friendly
Merge branch 'bugfixes/tokumx-1.3'