SOLR-6130: Added com.uwyn:jhighlight dependency to, and removed asm:asm dependency from the extraction contrib - dependencies weren't fully upgraded with the Tika 1.4->1.5 upgrade (SOLR-5763) (merged trunk r1599663)

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