LUCENE-6007: Regularize ivy.xml files to use configurations that map to remote master configurations, so that Ivy won't try to download extraneous crap (merged trunk r1632430, r1632829, r1633647)

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_10@1633651 13f79535-47bb-0310-9956-ffa450edef68
SOLR-6524: Collections left in recovery state after node restart because recovery sleep time increases exponentially between retries

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