[RefData][ORI] Fixed a few POR after comparing Geonames and RFD with the new trunk_ng branch development.
Merge branch 'trunk' into trunk_ng