Merge changes from trunk through revision 1400690; update XGC lib with new post 1.5 svn-trunk version.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-1_1@1400697 13f79535-47bb-0310-9956-ffa450edef68