ENG-7352: Don't lose the default heartbeat timeout value when it's not
explicitly provided in a deployment file.
Merge branch 'eng7352'
ENG-7343: fix response content type.
Merge pull request #1890 from VoltDB/ENG-7343-download-deployment

ENG-7343: fix response content type.
Merge remote-tracking branch 'upstream/master'