use default location for help files
[FIXED JENKINS-17195] avoid whitespace in tag name
(enforced by JGit)
Add failing merge cases, and fix now visible bug