ENG-6041: zkport override.
Merge pull request #1265 from VoltDB/ENG-6041

ENG-6041: zkport override.
Merge branch 'master' into ENG-5901-real