Fix conflicting lines for making it possible to have a clean backport of security fixes in 7189

[deneb-alpha]

What does this PR change?

Fix conflicting lines for making it possible to have a clean backport of security fixes in #7189.

GUI diff

No difference.

Before:

After:

• DONE

Documentation

• No documentation needed: this is a temp change for allowing the backport of Backport of #7170 #7180 #7188 and tagging #7189

• DONE

Test coverage

• No tests: this is a temp change for allowing the backport of Backport of #7170 #7180 #7188 and tagging #7189

• No tests: already covered

• Unit tests were added

• Cucumber tests were added

• DONE

Links

Relates: #7189
Relates: https://github.com/SUSE/spacewalk/issues/21856

• DONE

Changelogs

Make sure the changelogs entries you are adding are compliant with https://github.com/uyuni-project/uyuni/wiki/Contributing#changelogs and https://github.com/uyuni-project/uyuni/wiki/Contributing#uyuni-projectuyuni-repository

If you don't need a changelog check, please mark this checkbox:

• No changelog needed

If you uncheck the checkbox after the PR is created, you will need to re-run changelog_test (see below)

Re-run a test

If you need to re-run a test, please mark the related checkbox, it will be unchecked automatically once it has re-run:

• Re-run test "changelog_test"
• Re-run test "backend_unittests_pgsql"
• Re-run test "java_pgsql_tests"
• Re-run test "schema_migration_test_pgsql"
• Re-run test "susemanager_unittests"
• Re-run test "javascript_lint"
• Re-run test "spacecmd_unittests"

[github-actions]

Suggested tests to cover this Pull Request

• srv_menu
• srv_check_channels_page
• srv_power_management_redfish
• srv_create_repository
• min_move_from_and_to_proxy
• srv_cobbler_buildiso
• srv_cobbler_sync
• srv_cobbler_profile
• srv_distro_cobbler
• minkvm_guests
• proxy_retail_pxeboot_and_mass_import
• min_retracted_patches
• srv_push_package
• proxy_as_pod_basic_tests
• srv_cobbler_distro
• srv_power_management
• min_timezone
• srv_virtual_host_manager
• allcli_update_activationkeys
• srv_check_sync_source_packages