KNOX-280: Add more retry/timeout logic to make test more resilient.
Merge remote branch 'origin/apache-ref/master' into baikal-GA-0.4.0