replace country names with country codes for organization.country
fix accessmode/license
replace licence with accessright
move changes from dnet4