SOLR-1351, SOLR-4717 -- facet same field multiple ways

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