Core/Instances: merged some master branch commits in preparation for merging the upcomming instance save rewrite

src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp

@@ -57,7 +57,7 @@ class instance_stratholme : public InstanceMapScript
 
         struct instance_stratholme_InstanceMapScript : public InstanceScript
         {
-            instance_stratholme_InstanceMapScript(Map* map) : InstanceScript(map)
+            instance_stratholme_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
             {
                 SetHeaders(DataHeader);