Merge pull request #21049 from smowton/smowton/admin/java-buildless-p…

Merge pull request #21049 from smowton/smowton/admin/java-buildless-p… #10494