Merge remote-tracking branch 'root/master' into junbo-2.x-fix

Signed-off-by: wangjun <wangjunbo924@gmail.com>

Conflicts:
	vertx-core/src/main/java/org/vertx/java/core/http/HttpClient.java
	vertx-core/src/main/java/org/vertx/java/core/http/impl/DefaultHttpClient.java