Scripts/ToCr: Bosses shouldn't despawn so quickly
Core/Spells: *Properly* solve the Disarm vs Bladestorm issue
Merge pull request #12218 from Trisjdc/tocr_despawn_time

Scripts/ToCr: Bosses shouldn't despawn so quickly
Merge pull request #12220 from Trisjdc/spelll_triggerflag_check

Core/Spells: *Properly* solve the Disarm vs Bladestorm issue
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into ghbb

Conflicts:
	src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h