Re-apply patches to fix issues wesnoth#2844 and wesnoth#2846 in SotA

This restores the changes from the following commits:

 * "SotA S2: fixed inconsistency between unit name and dialog (fixes wesnoth#2844)" - commit ab9f29a
 * "SotA S8: fixed inconsistent Ghost name (fixes wesnoth#2846)" - commit fc6c3ac

(cherry picked from commit 97cc0f8)

data/campaigns/Secrets_of_the_Ancients/scenarios/02_Dark_Business.cfg

@@ -276,7 +276,7 @@ of Healing"
             image=items/gravestone1.png
         [/item]
 
-        {PLACE_GUARD 10 11 (Spearman) RESILIENT QUICK "Gwillyn" (_"Gwillyn")}
+        {PLACE_GUARD 10 11 (Spearman) RESILIENT QUICK "Gwyllin" (_"Gwyllin")}
         {PLACE_GUARD 10 10 (Spearman) QUICK RESILIENT "Veomyr" (_"Veomyr")}
         {PLACE_GUARD 8 10 (Spearman) STRONG RESILIENT "Syrillin" (_"Syrillin")}
         {PLACE_GUARD 7 10 (Bowman) STRONG INTELLIGENT "Glant" (_"Glant")}
@@ -293,7 +293,7 @@ of Healing"
 #endif
 
         # We don't want the guard on the village to move from there:
-        {FREEZE_UNIT Gwillyn}
+        {FREEZE_UNIT Gwyllin}
 
         [store_locations]
             terrain=*^Gryv

data/campaigns/Secrets_of_the_Ancients/scenarios/08_Carcyn.cfg

@@ -89,7 +89,7 @@ After several days of travel, he approached the frontier town of Carcyn."
         [unit]
             type=Shadow
             side=1
-            name= _ "Vash Gorn"
+            name= _ "Vash-Gorn"
         [/unit]
         [unit]
             type=Ghost