Backport jenkins 1.565 and openshift-java-client fixes.