-Fix vertx test failures
-update vertx version to 2.1.1
Merge pull request #1685 from gaohoward/master_vertx_testfix

Fix vertx test failures and update vertx version to 2.1.1