Fix merge issues from applying 2.4.7-p3 patch#111

rhoerr merged 1 commit intomage-os:release/1.xmage-os/mageos-magento2:release/1.xfrom

rhoerr:fix/2.4.7-p3-patch-differencesrhoerr/mageos-magento2:fix/2.4.7-p3-patch-differencesCopy head branch name to clipboard