[IMP] Fix for duplicated cities

Merged Jose Luis Zanotti requested to merge 12.0-cities_for_sales into 12.0-stage

Merge request reports