CE-1018 Base city_cat_mapping updates on data from ExactTarget