(ABM-411) fixed wrongly coded cross border trip mode choice UECs.
Adjusted some of the cross border codes.
Merge branch 'wsu' into develop