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

set city_id for avatars, otherwise use wgCityId