LUCENE-5694: don't score subscorers in DisjunctionSum/Max unless score is called

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1596914 13f79535-47bb-0310-9956-ffa450edef68
SOLR-5468: add a short wait after healing the partitions for state to propagate to address intermittent Jenkins failures.

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