Disabled "heartbeatThread.Join" statement to avoid deadlock
Merge pull request #2466 from Benglin/RC0.7.2_master

Disabled "heartbeatThread.Join" statement to avoid deadlock