JBIDE-14818 further cleanup of the code to ensure the classes are easily extendable for openshift