Upgrade scripts have different versions merged in upgrade.d folder

Brief Description
-------
During upgrade activation, in /etc/upgrade.d/, two different versions of scripts are mixed together:

$ ls
01-remove-armada-if-unused.py
02-delete-pod-eviction-timeout-service-parameter.py
02-remove-psp-service-parameter.py
03-delete-encrypted-fs-service-parameter.sh
04-add-tls-version-cipher-parameters.sh
05-oidc-service-parameters-migration.py
06-security-kubeapi-service-parameters-apply.py
07-remove-vault.sh
08-activate-keystone.py
09-cleanup-dnsmasq-hosts-file.py
100-update_dcmanager_subclouds_table.py
101-configure-ipsec-on-hosts.py
102-create-required-platform-certs.py
103-update-psql-roles.py
104-remove-admin-role.py
10-renew-pxeboot-dhcp-leases.py
117-ptp-db-upgrade.py
11-update-static-hieradata.py
12-create-sysinv-upgrade-entries.py
13-add-mgmt-fqdn-to-dnsmasq.py
13-drbd-update-secure-config.sh
14-populate-ihost-sw-version-field.py
15-update-controllerfs-state.py
16-update-filesystems-capabilities.py
17-ldap-users-backup.sh
18-assert-docker-health.sh
18-resize-systemcontroller-filesystems.sh
196-k8s-update-system-node-rbac.sh
197-reset-config-target.py
198-update-isystem-data.py
199-update-sysinv-motd.py
19-enable-fluxcd-controllers.py
19-recreate-vim-systemcontroller-endpoint.sh
20-barbican-data-migration.sh
20-k8s-app-upgrade.sh
21-keystone-data-migration.sh
21-watch-apps-upgrade.sh
22-add-service-parameter.py
22-resize-systemcontroller-filesystems.sh
23-recreate-vim-systemcontroller-endpoint.sh
24-barbican-data-migration.sh
25-keystone-data-migration.sh
26-add-service-parameter.py
29-mgmt-network-fqdn-reconfig.py
30-update_network_addrpool_table.py
35-sync-system-local-ca-in-subclouds.py
40-assert-docker-health.sh
50-remove-calico-ipip.py
62-enable-fluxcd-controllers.py
65-k8s-app-upgrade.sh
66-k8s-wrcp-dm-app-upgrade.sh
67-update-openldap-users.sh
80-remove-psp-autogenerated-policies.py
82-watch-apps-upgrade.sh
83-restart-vault-pods.sh
86-upgrade-dm.sh
88-remove-subcloud-endpoints.py
89-sync-dcorch-subcloud-mgmt-ip.py
92-reset-k8s-pki-folder-permissions.sh
93-update-mgmt-ipsec-flag.py
94-capabilities-column-cleaning.py

There's, among others, cases like:

20-k8s-app-upgrade.sh and 65-k8s-app-upgrade.sh;
18-resize-systemcontroller-filesystems.sh and 22-resize-systemcontroller-filesystems.sh
We can see the wrong execution, in software.log (this script is now in position #22):

2024-12-13T17:30:42: 18-resize-systemcontroller-filesystems.sh[81955]: INFO: Starting filesystems resize on DC System Controller for increased parallel subcloud deployment for from release 22.12 to 24.09 with action activate
2024-12-13T17:30:42: 18-resize-systemcontroller-filesystems.sh[81955]: INFO: Not a DC System Controller deployment. No filesystem resize needed.
2024-12-13T17:30:42: 18-resize-systemcontroller-filesystems.sh[81955]: INFO: Filesystems resizing for DC System Controller finished successfully for from release 22.12 to 24.09 with action activate

Severity
-------
<Major: System/Feature is usable but degraded>

Steps to Reproduce
-------
1 - Install stx-8
2 - Upgrade system controller
3 - Upgrade subclouds <- hit issue here

Expected Behavior
-------
Subcloud is upgraded

Actual Behavior
-------
Activate phase failed due to cert-manager error

Reproducibility
-------
Reproduced in two different subclouds

System Configuration
-------
Any

Last Pass
-------
N/A

Timestamp/Logs
-------
In description above.

Alarms
-------
NA

Test Activity
-------
Upgrade Testing

Workaround
-------
NA