HCOLL-200 fixed - testBootstrapAndHeartbeat
Merge remote-tracking branch 'origin/master'