merge to trunk

git-svn-id: https://svn.apache.org/repos/asf/poi/branches/xml_signature@1618405 13f79535-47bb-0310-9956-ffa450edef68