Update to Vert.x 2.1.RC2 and a minor test tweak