Merged revision(s) 1693143,1693144 from lucene/dev/trunk: SOLR-7227: Don't create the WAR file at all