Backport CAMEL-23252 and CAMEL-23276 to 4.18.x#22489

Croway merged 7 commits intoapache:camel-4.18.xapache/camel:camel-4.18.xfrom

Croway:backport-CAMEL-23252-CAMEL-23276-4.18.xCroway/camel:backport-CAMEL-23252-CAMEL-23276-4.18.xCopy head branch name to clipboard