SOLR-5118: more testing of edge case and some error conditions (merge r1518352)

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