some more updates to use the new style
Merge branch 'master' of github.com:h2oai/h2o-dev