Merge pull request #694 from jbonofre/AMQ-8347

[AMQ-8347] Upgrade to Camel 2.25.4