TEZ-1746. addendum. Increase the timeout of TestExceptionPropagation.testExceptionPropagationSession

(cherry picked from commit 8f8bac8430b7b2cba6bbada66724b61c890521b6)
Revert "TEZ-1642. TestAMRecovery sometimes fail. (zjffdu)"

This reverts commit 088358973205295da006eb2e8dbcb57d87858818.