Pull up packaging fix from trunk.

git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/integration/elasticsearch/branches/release-2.1-branch@1692039 13f79535-47bb-0310-9956-ffa450edef68