SOLR-6179: fix eol prop issue found for precommit

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1610907 13f79535-47bb-0310-9956-ffa450edef68
SOLR-6136: backport fixes for precommit issues

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