minor fix in script if osm_xml is dir; and fix if running integr test
fixed integration test; no agriculture for CAR