JBIDE-11099 third PR attempt (fixes indents, removes sourceDirectory=src) >> master