Two table round-tripping bug fixes

Fixes two new wt2wt tests added in https://gerrit.wikimedia.org/r/54595.

Change-Id: I828fc511c9c648b23894c06108550f7ad7b7d070