Update GeoData to master tip

Change-Id: I734df143ad5345dbc8735864a729db513857a87d
Merge "Update GeoData to master tip" into wmf/1.22wmf4