Slight fix to lock-collision test

Works with 10 jvms on one lappy now
Merge branch 'master' of https://github.com/0xdata/h2o
Merge branch 'master' of https://github.com/0xdata/h2o