Fix ComputeAction.execute by returning the right deferred when locked (OMS-222)