[18.0.0-proposed] [test-operator] Add the wait_timeout parameter to cleanup tasks

[18.0.0-proposed] [test-operator] Add the wait_timeout parameter to cleanup tasks #691