Merge in trunk@1356601


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