TIKA-1084 Merge image/x-icon (old) with the newer standard image/vnd.microsoft.icon

git-svn-id: https://svn.apache.org/repos/asf/tika/trunk@1445629 13f79535-47bb-0310-9956-ffa450edef68