fix: correct moby-engine cherry-pick to keep consistency (#10028)

Cherry-pick of CVE-2024-41110 from fast-track branch to main branch was malformed. Correct the inconsistency by keeping "-7" release version as the CVE fix since this is what is published via fast-track, and then update #9877 to be "-8" release, which will be built and published at next opportunity.

fixes: #9966 : "[AUTO-CHERRYPICK] fix CVE-2024-41110 in moby-engine - branch main"

Signed-off-by: Chris Co <chrco@microsoft.com>

Author: christopherco

SPECS/moby-engine/moby-engine.spec

@@ -3,7 +3,7 @@
 Summary: The open-source application container engine
 Name:    moby-engine
 Version: 24.0.9
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: ASL 2.0
 Group:   Tools/Container
 URL: https://mobyproject.org
@@ -123,13 +123,11 @@ fi
 %{_unitdir}/*
 
 %changelog
-<<<<<<< HEAD
-* Wed Jul 17 2024 Muhammad Falak R Wani <mwani@microsoft.com> - 24.0.9-7
+* Mon Aug 05 2024 Muhammad Falak R Wani <mwani@microsoft.com> - 24.0.9-8
 - Drop requirement on a specific version of golang
-=======
+
 * Mon Jul 29 2024 Rohit Rawat <rohitrawat@microsoft.com> - 24.0.9-7
 - Fix for CVE-2024-41110
->>>>>>> dd2c6a30e (fix CVE-2024-41110 in moby-engine (#9951))
 
 * Tue Jun 25 2024 Henry Beberman <henry.beberman@microsoft.com> - 24.0.9-6
 - Backport upstream change to search /usr/libexec for docker-proxy without daemon.json