JBIDE-11099 third PR attempt (fixes indents, removes sourceDirectory=src)
Merge remote-tracking branch 'origin/JBIDE-11099c'
 - modifications to be able to merge pull request for runtime detectors