ARTEMIS-3296: get things building on Java 16 (and 17EA+21)