Merged from branch
Rename misspelled file
Added hint as described in #2506979.
Move ch.sahits.codegen.help to trunk directory