SOLR-5907: Fix messed up merge - conflicted twice and screwed up the second merge.
SOLR-5907: Fix messed up merge - conflicted twice and screwed up the second merge.

git-svn-id: 308d55f399f3bd9aa0560a10e81a003040006c48@1581177 13f79535-47bb-0310-9956-ffa450edef68

apache/solr,apache/solr,apache/solr,apache/solr,apache/solr