More ANT.XML tweaks for Jenkins building