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: 13f9c63152c129021c7e766f4ef575faaaa595a2@1581178 13f79535-47bb-0310-9956-ffa450edef68

PATRIC3/p3_solr,PATRIC3/p3_solr,PATRIC3/p3_solr,PATRIC3/p3_solr,PATRIC3/p3_solr,PATRIC3/p3_solr,PATRIC3/p3_solr