Updated SOLR-5441

[Erick Erickson]

I committed to trunk and 4x just now, we'll see if that cures the test
errors.

I won't be doing any more on it tonight, so if it's still a problem someone
else will have to take a whack at it.

Erick