[TW270] - Revert the non-working Rune Grace period patch (again)

This reverts commit a0633496ac8e0fb3ff5e036d3a97bd6f590be78b.
[TW271] - Core/Scripts: Correct encounter id at Thorim's script (should fix the issue with XT's faulty teleporter and some other)
Merge branch 'master' of https://github.com/TrueWoW/TrinityCore into ghbb

Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.cpp