Fix vertx test failures and update vertx version to 2.1.1