CLSN-1616 remove state/region = > map to location
Merge branch 'master' of https://github.com/algosystech/collosys