Use a branching friendly ClickStack name and version number. The tomcat version (7 or 8) must given in the version (used to create the tag) and not in the ClickStackName
Simplify
Merge commit 'ea14f633597c828a8df4bcebf7771825eefae39c' into tc7.0.x

Conflicts:
	gradle.properties