fix missing idInVocabulary for countries; implement country mapping for EditGeoService (#3452, #3651)
fix missing idInVocabulary for countries; implement country mapping for EditGeoService (#3452, #3651)