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
cleanup