Merged revision(s) 1518839 from lucene/dev/trunk: LUCENE-5191: Fix Unicode corrumption in HTML escaping of Standard Highlighter and Fast Vector Highlighter.