Added o.apache.batik to built modules
Merge branch 'batik-fixes'