Core/SAI: CleanUp in 98257b94728223ff027c3696b630462288c85255 / 2838a622647a1e12ec483b59440c7d0414dc14fa
Core/Worldserver: Fix worldserver stuck on "Halting process" on shutdown

Partially revert 4fe45b8c63d3c4118a0a69c6ed44573c53eba54c to fix worldserver stuck on "Halting process" on shutdown.

Fixes #13201
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into ghbb