SOLR-5190 (backport)
apply patch in full (including test)
Merge pull request #1 from dsiebel/SOLR-5190

SOLR-5190 (backport)