[JBIDE-18621] N&N for OpenShift 2.6.0.CR2