(ABM-554) Update 2015, 2020, and 2040 AOC
(ABM-555) correct property file to make toll only modes at OME effective
in 2020 not 2015.
Merge branch 'wsu' into develop