- merged: vertx 2.0 changes