Merge latest gradle-template: fixes release process