[CXF-5836] Fix NPE when nonProxyHosts is used
Patch from Nicolas Sprauel applied
[CXF-5818] Fix stackoverflow with TLS
Recording .gitmergeinfo Changes