Merge "Bug 484127 - Insertion of the '<' character inside a gendoc template breaks the doc generation"