#161 Use - as a replacement token for the branch normalisation in templates
(cherry picked from commit 5e76b47)
#161 Use - as a replacement token for the branch normalisation in templates - correction of integration tests
(cherry picked from commit 69334c2)