TIKA-1170: Insufficiently specific magic for binary image/cgm files
   - Fix for incorrect application of patch
   - Additional test and resource from Andrew Jackson for false positive cgm matches on malformed HTML files


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