[RefData][ORI] Fixed a few Geonames ID in the file of best known POR entries.
[RefData][ORI] Integrated the latest updates from Geonames.
Merge branch 'trunk' into trunk_ng