CON-548: Added city_id field to wikia_hub_modules and primary_key
CON-548: Remove city_id from primary key