SOLR-5354: fix attribution

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1546589 13f79535-47bb-0310-9956-ffa450edef68
LUCENE-5285: Improved highlighting of multi-valued fields with FastVectorHighlighter.


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