HCOLL-251 Make the tests more stable.
Merge remote-tracking branch 'origin/master'