Fix player abilities Bloodrage and Enrage.

These abilities caused you to enter combat when you used them prior to
patch 2.3.0. Canceling them removes you from combat if you are not
fighting a creature or in PvP/dueling.

Fixes cmangos/issues#374.
Merge branch 'bloodrage_enrage_combat' of https://github.com/Patman64/mangos-classic into develop