Core/Battleground: fixed possible crash in BattlegroundSA

Closes #11969
DB/Creature Fix incorrect trigger flags on Enchanted Tiki Warrior

By dr-j closes #11973
Core/Text: Fix typo in 5caf6aad98eba766017b6a3acc04dd0e30086142
DB/Locales: Fix some item locales because items renamed on cata
Closes #11974
DB/Gossip: Fix some gossip stuff
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore
DB/Creature: Fix Dead Mage Hunter

By dr-j closes #11979
Core/Spells: Fix hots proccing wrong auras

& Partly revert unnecessary changes in 1719e19572bc22463edbcbe4089e68a97019e787
Merge pull request #11981 from Unholychick/patch-1

Core/Spells: Fix hots proccing wrong auras
Revert "Fix percentage HOTs proccing everything"

This reverts commit 2cfdc074c14cab6e2e41696fa98d615263e1650b.
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore

Conflicts:
	src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
	src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
	src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp
	src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
	src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
	src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
	src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp
	src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
	src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp
	src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
	src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp
	src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
	src/server/scripts/Outland/zone_hellfire_peninsula.cpp
	src/server/scripts/World/go_scripts.cpp
[TW296] - Updating OVERRIDE to override in custom scripts.
[TW297] - More OVERRIDE/override changes and UpdateEntry changes in custom scripts.
Merge branch 'master' of https://github.com/TrueWoW/TrinityCore

Conflicts fixed:
	src/server/scripts/Custom/HallsOfReflection/TW_boss_lich_king_hor.cpp
	src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
	src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
	src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
	src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
	src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
	src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp
	src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
	src/server/scripts/World/go_scripts.cpp
Core/Misc: Fix static analysis issues
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore
Core/Auth: Add support for build 13930 of china

By phoenixfight closes #11978
Merge branch 'master' of https://github.com/TrueWoW/TrinityCore
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore
Merge pull request #4 from amsjunior1/master

pull