[3057] Fix some Ulduar issues and implement achievements 2996 and 2997

Signed-off-by: Xfurry <xfurry@scriptdev2.com>