Fix for SOLR-4543, setting shardHandlerFactory in solr.xml/solr.properties does not work

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1456433 13f79535-47bb-0310-9956-ffa450edef68
SOLR-4543 added note to CHANGES.txt

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