SOLR-2245: Backport from trunk.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1611678 13f79535-47bb-0310-9956-ffa450edef68
SOLR-3893: DIH should not depend on mail.jar,activation.jar

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1611685 13f79535-47bb-0310-9956-ffa450edef68