Merge pull request #37 from detiber/enterprise-2.0

Backport jenkins 1.565 and openshift-java-client fixes.