ENG-5600: increase client-server timeout to 30s
Merge branch 'master' into ENG-5600
Merge pull request #1066 from VoltDB/ENG-5600

ENG-5600: increase client-server timeout to 30s