Refactored TimeoutRedirectResetsOnActivity tests.

-Added RetryOnFail test rule.

Change-Id: I0b2cd5af0a144c29855c3ba1e158ba54900a9523
Added integration test for WebSphere Portal. (#13309)

Change-Id: I576fb145cd34f98ffa90657e20f5a7c1854f470c
Merge changes from origin/7.1

08b0589 Refactored TimeoutRedirectResetsOnActivity tests.
5057c59 Added integration test for WebSphere Portal. (#13309)

Change-Id: I50c8a8f6513679dca611889b43782d6ee6089d6c