ENG-7197: update deployment via JSON
ENG-7197: review changes.
ENG-7197: fix test
Merge pull request #1901 from VoltDB/ENG-7197-update-deployment-json

ENG-7197: update deployment via JSON
Merge remote-tracking branch 'upstream/master'