CLSN-1485 settlement code review
Merge branch 'master' of https://github.com/algosystech/collosys