[JBIDE-15879] use openshift-java-client 2.5.0.Final

Conflicts:
	plugins/org.jboss.tools.openshift.express.client/META-INF/MANIFEST.MF
	plugins/org.jboss.tools.openshift.express.client/build.properties
[JBIDE-15879] use openshift-java-client 2.5.0.Final
Merge branch 'JBIDE-15879-42'

Conflicts:
	plugins/org.jboss.tools.openshift.express.client/META-INF/MANIFEST.MF