KNOX-301: Increase timeouts to try and fix test timeout issue on centos5.
Merge remote branch 'origin/apache-ref/master' into baikal-GA-0.4.0