LUCENE-5415,LUCENE-5376: get MultiTermQuery highlighting working; fix compilation errors

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene5376@1563180 13f79535-47bb-0310-9956-ffa450edef68