Increased the timeout for 2 tests that were taking long on Hythloth.

Change-Id: Ieb01b78691a88d168b4875022cbbfcde5a8c9680
Merge topic 'increased-timeout' into master

5306b3b3 Increased the timeout for 2 tests that were taking long on Hythloth.