set city_id for avatars, otherwise use wgCityId
Merge pull request #2884 from Wikia/release-210-2879

set city_id for avatars, otherwise use wgCityId