ENG-5600: increase client-server timeout to 30s
Merge branch 'master' into ENG-5600
ENG-5684: merge home changes
Merge branch 'ENG-5684' of https://github.com/VoltDB/voltdb into ENG-5684
Merge pull request #1066 from VoltDB/ENG-5600

ENG-5600: increase client-server timeout to 30s
Merge branch 'master' into ENG-5684