REBASE: Merged PR 262: Restore capsule functionality after bad merge.

Restore capsule functionality after bad merge.

Capsules sent from the UEFI shell still worked, but capsules from Windows were broken due to extra header information. Restore the code to strip extra header information.
Need to audit this code to bring more in-line with previous solution.

MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c

@@ -1164,15 +1164,16 @@ ProcessFmpCapsuleImage (
   // MS_CHANGE [BEGIN]
   // Validate the capsule (perhaps again) before processing in case some one calls
   // ProcessFmpCapsuleImage() before or without calling ValidateFmpCapsule()
-  // if (!IsFmpCapsuleGuid(&CapsuleHeader->CapsuleGuid)) {
-  //   return ProcessFmpCapsuleImage ((EFI_CAPSULE_HEADER *)((UINTN)CapsuleHeader + CapsuleHeader->HeaderSize), ResetRequired);
-  // }
   Status = ValidateFmpCapsule(CapsuleHeader, NULL);
   if (EFI_ERROR(Status)) {
     return Status;
   }
   // MS_CHANGE [END]
 
+  if (!IsFmpCapsuleGuid(&CapsuleHeader->CapsuleGuid)) {
+    return ProcessFmpCapsuleImage ((EFI_CAPSULE_HEADER *)((UINTN)CapsuleHeader + CapsuleHeader->HeaderSize), ResetRequired);
+  }
+
   NotReady = FALSE;
   Abort = FALSE;