fix test failures resulting from removing the useVehicles switch
Authored by: vsp_nagel 2015-06-28
Parent: [r33636]
Child: [r33638]