Trying to refactor ABM-228.  Creating bug ABM-248.

Signed-off-by: John Mulholland <john.mulholland@rsginc.com>
Refactored DMU for ABM-228
Removed uneeded commented out code for ABM-228
Merge branch 'feature-228' into develop
Merge branch 'develop' of https://github.com/SANDAG/ABM into develop