Pull up Maven 3 fixes

git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/branches/release-2.17-branch@1881682 13f79535-47bb-0310-9956-ffa450edef68
43 files changed