[github-356] accept some of the changes in this PR (not all)

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1902784 13f79535-47bb-0310-9956-ffa450edef68
5 files changed