Update to latest changes in vertx core