DB/Misc: Fix Conqueror Krenna/Gorgonna Phasing

Fix phasing on Conqueror Krenna/Gorgonna in Conquest Hold (Grizzly Hills) so once The Conquest Pit: Final Showdown is turned in Conqueror Krenna and her 2 side parts disappear and Gorgonna replaces Conqueror Krenna as leader of conquest hold.
Fix some DB errors I am responsible for.

Grr, I was going to script these but found was already scripted, but I left the ids in the line to set ai name in the commit I did make

Closes #12912
Core/Dependencies: Update G3D to v9.0 r4036
Merge remote-tracking branch 'upstream/master'

Conflicts:
	sql/updates/world/2014_08_22_03_world_misc.sql