Scripts/Ulduar: fix Achievs "Champion of Ulduar" and "Conqueror of Ulduar"

Signed-off-by: treak <goodfeelingzzz@gmail.com>
Codestyle
Merge pull request #13500 from treak/fix_champion_conqueror_of_ulduar_achieve

Scripts/Ulduar: fix Achievs "Champion of Ulduar" and "Conqueror of Uldua...
Merge branch '3.3.5' of https://github.com/TrinityCore/TrinityCore into master_revamp

Conflicts:
	src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
	src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h