Make cleanup timeout a task specific property

Fixes #19