Eng7352 (Review only)

Fix a bug where we lost the default heartbeat timeout setting.  

Don't push the button, I'll squash-merge this after review.