Core/Movement:Fix waypointed creature aggro
Core/Spells: Fixed Shadowstep taking the caster out of combat while it shouldn't
Make Cyclone and faerie fire unable to pierce cyclone and banish
Core/Spells: Define and implement SPELL_ATTR7_NO_PUSHBACK_ON_DAMAGE
Fixed SendAddonMessage issue.

This fixes GM's not being able to send/receive addon messages through the whisper channel while accepting whispers are turned off.
Core/Spells: Replace MovePosition by MovePositionToFirstCollision in spell dest target handling.

- Solves issues such as being able to summon creatures inside terrain/gameobjects, being able to fall through terrain by using Shadowstep/Feral Charge (Cat), and much more
Core/Players: Fix haste rating formulas. They're supposed to be the addition, not the multiplication of all available bonuses

- This change matches client formulas
Core/CreatureAI: Implement CreatureAI::TalkToMap for all your map-wide talking needs. Could also replace Battleground::SendChatMessage
Core/Arena: Fix exploit in arena team

Fix exploit that allowed anyone to add a target Player to any arena team.
DB/Conditions: Fix startup error added on 018da66
Scripts/SWP: Sathrovarr will no longer cause player teleports on grid load
Merge pull request #12058 from Trisjdc/sunwell

Scripts/SWP: Sathrovarr will no longer cause player teleports on grid load
Merge pull request #12021 from Trisjdc/spell_target_dest

Core/Spells: Replace MovePosition by MovePositionToFirstCollision in spell dest target handling.
Core/Misc: Fix crash in ticket creation

Fix a crash happening with malicious CMSG_GMTICKET_CREATE packets.
Core/Spells: Fix Cheat Death formula
Core/SAI: Prevent nullifying damage, because of player damage requirements
Fix various warnings. The core, the scripts and the tools now compile without warnings with -Wall -Wextra -pedantic.

-Fix warnings from -Woverflow on implicit constant conversion.
-Fix warnings from -pedantic.
-Fix warnings from -pedantic.
-Fix warnings from -Wformat.

Two minor changes in addition :

-Replace a defined value equal to 2^31 - 1 by std::numeric_limits<int>::max().
-Remove useless null-check on pointer returned by new. New doesn't returns nullptr on failure, it throws std::bad_alloc.
Remove changes in dep file.
Core/SAI: Clear UNIT_STATE_EVADE immediately if we're about to follow a target on EnterEvadeMode (MoveFollow does not clear evade)
Contrib: Added an updated version of the configuration file merger tool.

This one lets you choose which value to keep between the two configuration files.
Make sure to carefully read the file's lines 3 to 9 to make sure you don't misuse it and get back at me later raging.
It is not exactly as I would like it to be, but current state will have to do.

You can try it out live at: http://tinyurl.com/kzxmrlm