SOLR-6062: Fix undesirable edismax query parser effect (introduced in SOLR-2058) in how phrase queries

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1617719 13f79535-47bb-0310-9956-ffa450edef68
SOLR-2894: Distributed query support for facet.pivot

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1617789 13f79535-47bb-0310-9956-ffa450edef68
Merge remote-tracking branch 'upstream/trunk' into SOLR-5986