SOLR-5118: more testing of edge case and some error conditions

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1518352 13f79535-47bb-0310-9956-ffa450edef68
LUCENE-5190: Fix failure of TestCheckIndex.testLuceneConstantVersion in Jenkins trunk clover build and other builds using -Ddev.version.suffix

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1518354 13f79535-47bb-0310-9956-ffa450edef68
Merge branch 'trunk' of http://git.apache.org/lucene-solr into lucene-4818
LUCENE-4818 - detailed some TODOs