Consistent <component> formatting in unattend.xml

quickget

@@ -550,8 +550,10 @@ function unattended_windows() {
     </component>
 
     <component name="Microsoft-Windows-PnpCustomizationsWinPE"
-      publicKeyToken="31bf3856ad364e35" language="neutral"
+      publicKeyToken="31bf3856ad364e35"
-      versionScope="nonSxS" processorArchitecture="amd64">
+      language="neutral"
+      versionScope="nonSxS"
+      processorArchitecture="amd64">
 
       <!--
            This makes the VirtIO drivers available to Windows, assuming that
@@ -601,8 +603,13 @@ function unattended_windows() {
   </settings>
 
   <settings pass="specialize">
-    <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64"
+    <component name="Microsoft-Windows-Shell-Setup"
-      publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
+      processorArchitecture="amd64"
+      publicKeyToken="31bf3856ad364e35"
+      language="neutral"
+      versionScope="nonSxS"
+      xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
       <ComputerName>*</ComputerName>
       <OEMInformation>
         <Manufacturer>Wimpys World</Manufacturer>
@@ -617,8 +624,13 @@ function unattended_windows() {
   </settings>
 
   <settings pass="oobeSystem">
-    <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64"
+    <component name="Microsoft-Windows-Shell-Setup"
-      publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
+      processorArchitecture="amd64"
+      publicKeyToken="31bf3856ad364e35"
+      language="neutral"
+      versionScope="nonSxS"
+      xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
       <OOBE>
         <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen>
         <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE>