fixing issues with pegjs config
Fix runtest commit for non-default modes

Change-Id: Id155187881ee65496bc393a7ef2c7a4ca4dec030
Code cleanup: Moved AttributeExpander specific helpers out of Util.

* As I was looking at some include* specific code changes, I found
  AttributeExpander specific helpers in Util -- there is no reason
  for them to be there since they are extremely specific to attr.
  expansion and have no value to other classes.

* Added a few FIXMEs to dead/duplicate utility functions.  Worth
  cleaning up at some point.

Change-Id: I23ab23a81d93c87efe51bd5c38b028d0ce015af2
Two table round-tripping bug fixes

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

Change-Id: I828fc511c9c648b23894c06108550f7ad7b7d070