Merged changes from Trunk up to revision 830265


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