Allow setting the timeout for stopping the container Add test Update man Signed-off-by: Ygal Blum <ygal.blum@gmail.com>