Merged /xmlgraphics/fop/trunk:r1149494-1177230

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