I have completed the merge of the jms-new-parser branch to the trunk
and all seems to be working well. I will switch all the Cisco runs
back to the trunk to get a more thorough shakeout.
I'll remove the jms-new-parser branch next week sometime to give
everyone time to move back to the trunk.