JBIDE-15337 changes to new interface constants due to enhanced
requirements, and cleanup of outdated internal api

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