JBIDE-15337 cleanup
JBIDE-15337 changes to new interface constants due to enhanced requirements