CDB-1856 finished fixing openstreetmaps.org OSM import + new spec