CLSN-1787 : location enum fixes + timer fixes
Merge branch 'master' of https://github.com/algosystech/collosys