Upgrade Vert.x to 2.1M5

This PR upgrades Vert.x to 2.1M5