Merge pull request #26 from robstryker/JBIDE-13782_runtimeDetection

JBIDE-13782 further changes for better nesting
JBIDE-6313 important changes to pull esb away from deprecated wtp classes