Update with latest vertx master changes