CI: additional tweaks
ant report
Merge branch '2.1.x'