vertx test fix
aerogear test fix
Merge pull request #1890 from andytaylor/master-fix

test fixes