JBIDE-13782 updates for more complete runtime detection

See jira