SOLR-4952: SolrCmdDistributorTest needs to force MergePolicy for consistent optimize() behavior (merge r1514377)

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