Conflicts fix after cherry pick of previous commit from master branch.
Core/Opcodes: Updated SMSG_SUPERCEDED_SPELL's structure to 4.3.4