Fixed merge conflicts

Also may have made some changes required by AS7-6497. I'll squash this
into the "Upgrade JBossTS to Narayana 5.0.0.M2" commit once I've see
the tests passing on Lightning.