Optimise and cleanup

[PaintNinja]

Unfortunately doesn't allow us to enable the configuration cache for full parallel execution of independent tasks within the same sub-project (such as the different JDKs in the testJdks task), but does speed up the configuration stage and improve IDE support nonetheless.