Fix test for TIKA-1502 - re-order the MediaTypeRegistry logic for getting the super type, so that if an explicit inheritance has been defined between one parametered type and another, that inheritance is used in preference to "drop all parameters"

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