ESR did not take dwarf-guard.png into account for renaming it...

...to dwarf.png. Fixing this.

* Rename image file (only the non-transparent portrait needed it).

* Fix wmllint rule.

* Fix relevant mainline references.

data/core/units/dwarves/Guardsman.cfg

@@ -5,7 +5,7 @@
     race=dwarf
     image="units/dwarves/guard.png"
     ellipse="misc/ellipse"
-    profile=portraits/dwarves/dwarf-guard.png
+    profile=portraits/dwarves/guard.png
     {MAGENTA_IS_THE_TEAM_COLOR}
     hitpoints=42
     movement_type=dwarvishfoot

data/multiplayer/scenarios/ANL_utils/ANL_leader_options.cfg

@@ -376,7 +376,7 @@ Negotiation Progress: $player_$side_number|.leader_option_2.progress|/$player_$s
                     [message]
                         speaker=narrator
                         caption=_ "Negotiation Complete"
-                        image="images/portraits/dwarves/dwarf-guard.png"
+                        image="images/portraits/dwarves/guard.png"
                         #wmllint: display on
                         message= _ "Our talks are complete - the Dwarves will gladly fight by your side. Which of our brethren do you want to recruit?"
                         #wmllint: display off

data/tools/wmllint

@@ -217,7 +217,7 @@ linechanges = (
         ("portraits/James_Woo/assassin.png",
          "portraits/humans/assassin.png"),
         ("portraits/James_Woo/dwarf-guard.png",
-         "portraits/dwarves/dwarf-guard.png"),
+         "portraits/dwarves/guard.png"),
         ("portraits/James_Woo/orc-warlord.png",
          "portraits/orcs/warlord.png"),
         ("portraits/James_Woo/orc-warlord2.png",