Revamp locking for actions with additional locking

+ hack to fix inconsistent state resulting from moving Computes after deployment