Correction in tag calculation

build.gradle

@@ -34,7 +34,7 @@ def calcTags(version) {
         tags += "${version.major}.${version.minor}.${version.rev}.${version.label}".toString()
     }
     // For non-master/non-release builds, change the tags to contain branch and build number
-    def isReleaseBuild = ci.isCi() && (ci.branch != null && (ci.branch.startsWith("master") || ci.branch.startsWith("release")) || ci.tag != null)
+    def isReleaseBuild = ci.isCi() && ((ci.branch != null && (ci.branch.startsWith("master") || ci.branch.startsWith("release"))) || ci.tag != null)
     if (!isReleaseBuild) {
         def branch = ci.tag ? ci.tag : ci.branch ? ci.branch.replace("/", ".") : "1.0.0"
         tags = tags.stream().map({ it + "-build-${branch}-${ci.buildNumber}" }).collect(Collectors.toList())