Recording .gitmergeinfo Changes
Enable protocol support for async http clients

Conflicts:
	systests/transports/src/test/java/org/apache/cxf/systest/https/ssl3/SSLv3Test.java
Recording .gitmergeinfo Changes
Fixing build