LUCENE-5944: Fix building TAR with solr WAR (merge error)

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