[CI] Java build broken on master

[Micah Kornfield]

This was due to an unexpected conflict between two patches I just merged.
I'm going to see if I can fix this quickly, otherwise I will rollback.