Moving to new version of step 2.2 layouts in ART tests, with updated naming of fields in service building, for consistency with step 3.0 geometries.
FYI @asalzbur @npetters @lmijovic @goblirsc @hhayward @nreadiof