(cherry picked from commit b948a4275e90c59db2599a1961937d62f17736ce) Conflicts: src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp src/server/scripts/Kalimdor/zone_tanaris.cpp src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp src/server/scripts/OutdoorPvP/OutdoorPvPZM.h src/server/scripts/Spells/spell_mage.cpp src/server/scripts/Spells/spell_paladin.cpp