[java-sig-commits] [aqute-bnd] Fixing build failures on f16 and later