XD-1388: Upgrade to batch M3
Upgrade spring to 4.0.2.RELEASE

- Also upgraded groovy `testCompile` dependency to `2.2.2`