SOLR-1351, SOLR-4717 -- facet same field multiple ways
........
Merged revision(s) 1468511 from lucene/dev/branches/branch_4x:


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