Fixed code formatting to be compliant with SANDAG standards. (ABM-143)
Merge branch 'checkstyle-cleanup' into develop