- Allow autoapply of build-setup plugin
- minor package reorganisation
fix GRADLE-2691 (PR from Pete); fix some formatting of generated build.gradle.