Update CreateMappings.ps1 to encode mapping file in UTF8 and fix mapping bug

Author: cormacpayne

tools/CreateMappings.ps1

@@ -29,8 +29,13 @@ $cmdlets | ForEach-Object {
     # Try to match this cmdlet with at least one rule.
     $possibleBetterMatch = @($rules | Where-Object { $cmdlet -cmatch ".*$($_.Regex).*" })[0];
 
-    # Look for a better match, but ensure that the groups match.
-    if(($matchedRule.Group -ne $null) -and ($matchedRule.Group -eq $possibleBetterMatch.Group)) {
+    # Look for the best match.
+    if(
+        # Did not find a match on the folder, but found a match on the cmdlet.
+        (($matchedRule -eq $null) -and ($possibleBetterMatch -ne $null)) -or 
+        # Found a match on the module path, but found a better match for the cmdlet (`group` field agrees).
+        (($matchedRule.Group -ne $null) -and ($matchedRule.Group -eq $possibleBetterMatch.Group)))
+    {
         $matchedRule = $possibleBetterMatch;
     }
 
@@ -44,8 +49,8 @@ $cmdlets | ForEach-Object {
 };
 
 # Write to files.
-$warnings | ConvertTo-Json | Out-File $WarningFile;
-$results | ConvertTo-Json | Out-File $OutputFile;
+$warnings | ConvertTo-Json | Out-File $WarningFile -Encoding utf8;
+$results | ConvertTo-Json | Out-File $OutputFile -Encoding utf8;
 
 # Print conclusion.
 Write-Host ""
@@ -55,4 +60,4 @@ Write-Host ""
 if($warnings.Count -gt 0) {
     Write-Host "$($warnings.Count) cmdlets could not be mapped and were placed in 'Other': $($WarningFile)." -ForegroundColor Yellow;
     throw "Some cmdlets could not be properly mapped to a documentation grouping: $($warnings -join ", ").  Please add a mapping rule to $(Resolve-Path -Path $RulesFile).";
-}
+}