fix remaining deadlocks + prep deletion#596

parkan merged 15 commits intomaindata-preservation-programs/singularity:mainfrom

fix/deadlock-hotfixdata-preservation-programs/singularity:fix/deadlock-hotfixCopy head branch name to clipboard