Merge "Move jjb-version to templates"