SOLR-5633: HttpShardHandlerFactory should make its http client available to subclasses

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1559236 13f79535-47bb-0310-9956-ffa450edef68
Planning
Planning
remove extra closing attribution parenthesis, which confuses changes2html

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1559293 13f79535-47bb-0310-9956-ffa450edef68
New file to test delete conflict on other branch
Modification for testing merge on other branch
Commit to test ours merging on other branch
SOLR-5476 ftests are being fixed . SO ignore for the time being

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1559399 13f79535-47bb-0310-9956-ffa450edef68
Merge branch 'trunk' of https://github.com/apache/lucene-solr into efbytesref