merge from mangoszero

...oom as the King of Stormwind

Fix based on several videos, screenshots and wowpedia. The Battlemasters
in Stormwind were all moved TO the War Room in patch 2.0.1 and I'm
moving them back to where they were in patch 1.12.1.