Give s3 tests more time to finish
Lower timeouts for planner perfomance test
Merge branch '4.2' - Lower timeouts for planner perfomance test