CLSN-234implement patching on subpolicy level

CLSN-201remove collection/recovery buttons from all screens
Merge branch 'master' of https://github.com/algosystech/collosys