KNOX-280: More tweaks trying to stabilize unit tests.
Merge remote branch 'origin/apache-ref/master' into baikal-GA-0.4.0