Scripts/ScarletMonastery: Kill an unused parameter warning
Merge branch '3.3.5' of https://github.com/TrinityCore/TrinityCore into ghbb
Core: Fix warnings

(cherry picked from commit 48d47998d9b4e5a234d4b2489f2954eded8dcbf0)

Conflicts:
	src/server/game/Entities/Object/Object.cpp
Merge branch '3.3.5' of https://github.com/TrinityCore/TrinityCore into ghbb