Project: springxd
Issue XD-3107: Fix gradle build issues
As a XD build master, I'd like to fix (local ./gradlew dist and distZip targets) the outstanding build issues, so I can evaluate that publish builds works as expected.
Story points: 3