JBIDE-14818 for openshift, depending on upstream astools changes

JBIDE-14818 for openshift, depending on upstream astools changes

JBIDE-14818 for openshift, depending on upstream astools changes