set city_id for avatars, otherwise use wgCityId
Merge pull request #2879 from Wikia/image_sync

set city_id for avatars, otherwise use wgCityId