Refactored TimeoutRedirectResetsOnActivity tests.

-Added RetryOnFail test rule.

Change-Id: I0b2cd5af0a144c29855c3ba1e158ba54900a9523
Merge changes from origin/7.2

08b0589 Refactored TimeoutRedirectResetsOnActivity tests.

Conflicts:
	uitest/src/com/vaadin/tests/components/ui/TimeoutRedirectResetsOnActivityTest.java

Change-Id: Id2dc47cb5396a24c97a2689c1412b29a421ac400