This commit updates the Gradle image building task to support building
images from executable and non-executable war files.

Fixes gh-23825