Merge branch 'JBIDE-14366-23x' into 2.3.x

Conflicts:
	src/main/java/com/openshift/client/IHttpClient.java
	src/main/java/com/openshift/internal/client/httpclient/UrlConnectionHttpClient.java
	src/test/java/com/openshift/internal/client/HttpClientTest.java