DB/Creature: Fix even more creature templates
DB/Gossip: Fix "Gyll <Gryphon Master>" Gossip
Closes #11956
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore