ENG-7352: Don't lose the default heartbeat timeout value when it's not
explicitly provided in a deployment file.
Merge branch 'eng7352'