LUCENE-3108: manually merged with trunk
LUCENE-3108: manually merged with trunk

git-svn-id: d6841b1cc070036626b7e517d5c75c97199175ba@1133855 13f79535-47bb-0310-9956-ffa450edef68

cscorley/solr-only-mirror,cscorley/solr-only-mirror,cscorley/solr-only-mirror