Pull up changes from trunk designed to fix maven build issues.

git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/integration/elasticsearch/branches/release-0.1-branch@1461741 13f79535-47bb-0310-9956-ffa450edef68
2 files changed