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