SOLR-5028,SOLR-5029: Fix ShardHandlerFactory creation and persistence

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