MODE-2321 Fixed & cleaned up some of the dependencies of Tika 1.6
Merge pull request #1289 from hchiorean/MODE-2321

MODE-2321 Fixed & cleaned up some of the dependencies of Tika 1.6