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

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