merge trunk

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

diff --cc src/java/org/apache/poi/util/IOUtils.java
Simple merge

diff --cc src/ooxml/java/org/apache/poi/xdgf/util/VsdxToPng.java
Simple merge

diff --cc src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java
Simple merge

diff --cc src/ooxml/testcases/org/apache/poi/sl/TestFonts.java
Simple merge