running the tests in testdir_multi_jvm, noticed some had old names for h2o things..fixed..also shortened some since we'll be running them soon on michal's jenkins
Merge branch 'master' of github.com:0xdata/h2o