resovle merge conlicts to master, adding recent master change to dev …

…branch (#11604)

Co-authored-by: Xiahe Liu <[email protected]>

custom-words.txt

@@ -122,6 +122,7 @@ aspnet
 asyncinfo
 asyncoperation
 atascada
+attestationcollateral
 Auditd
 australiaeast
 australiasoutheast
@@ -760,6 +761,7 @@ Informations
 Informix
 Ingestor
 ingressed
+inittime
 inkrecognizer
 inlinecount
 inlines
@@ -999,6 +1001,8 @@ Monospace
 mountainview
 MPNS
 MRAN
+mrenclave
+mrsigner
 MSAZR
 MSAZRDE
 MSCONCAT
@@ -1194,6 +1198,7 @@ Plex
 Pohlmann
 pois
 policyassignments
+policycertificates
 policydefinitions
 policyinsights
 policykey
@@ -1310,6 +1315,8 @@ recoveryservicessiterecovery
 recurse
 rediscache
 rediscachemanagement
+RediSearch
+redisenterprise
 Redshift
 Reenabled
 Refid
@@ -1762,6 +1769,7 @@ Unregistering
 Unregisters
 unrestorable
 unsubstituted
+Unsynced
 untagged
 Untracked
 unvalidated
@@ -2015,4 +2023,10 @@ Conntrack
 inotify
 Inotify
 swappiness
-Swappiness
+Swappiness
+unarchive
+unarchiving
+ssoadfs
+Idempotence
+Sqlpools
+privatelinkhub