SOLR-3936: Fixed QueryElevationComponent sorting when used with Grouping (merge r1514795)

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1514836 13f79535-47bb-0310-9956-ffa450edef68
SOLR-4718 Allow solr.xml to be stored in ZooKeeper

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