Having these builds be separate doesn't make sense since they do not have differing configurations.
Consolidating them reduces the number of steps to run these checks on diffs from 2 to 1 and has the side
benefit of reducing clutter on the Teamcity dashboard.