JAL-4413 timeouts Merge branch 'improvement/JAL-4217_added_a_timeout_to_tests' into...