(ABM-549) Correct Xborder Trip Mode Choice for year after OME POE is
open.
Merge branch 'wsu' into develop