[osm] adding no_global_overrides option for boundary configs

scripts/geodata/osm/components.py

@@ -131,6 +131,7 @@ class OSMAddressComponents(object):
         values = [(k, v) for k, v in six.iteritems(properties) if isinstance(v, collections.Hashable)]
 
         # place=city, place=suburb, etc. override per-country boundaries
+        if not config.get('no_global_overrides', False):
             for k, v in values:
                 containing_component = self.global_keys_override.get(k, {}).get(v, None)