KNOX-280: Tweak test to better handle timing and machine differences.
Merge remote branch 'origin/apache-ref/master' into baikal-GA-0.4.0