(cherry picked from commit 802ebbe36a57103814ee0ad90378f29f2585a2d7) Conflicts: src/server/game/Spells/Auras/SpellAuraDefines.h src/server/game/Spells/Auras/SpellAuraEffects.cpp
(cherry picked from commit 802ebbe36a57103814ee0ad90378f29f2585a2d7) Conflicts: src/server/game/Spells/Auras/SpellAuraDefines.h src/server/game/Spells/Auras/SpellAuraEffects.cpp