Modify xml highlight rules (add "xml" suffix to tokens)
Fix <CR><LF> handing in highlight_rules_test.js