Merge branch 'stable-2.16' into stable-3.0

* origin/stable-2.16:
  Replace tika by overviewproject mime-types to detect mime types
  Avoid any uses or lookups of ffmpeg by Tika

Change-Id: Ib68517a6df1ff0778f7637083155f8a5d491611e