-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
AMQP Multi Protocol support
Renaming ProtonRemotingconnection
simple renaming
more work done
more work
work done
work
fix
more work
fix
fix
fix