Brought the branch in sync with rev. 1560225 of trunk


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/batik/branches/custom-FontFamilyResolver@1562793 13f79535-47bb-0310-9956-ffa450edef68