Fix potential test timing issue.
Merge remote branch 'origin/apache-ref/master' into baikal-GA-0.4.0