Fix for CAMEL-7498.  Most of this was already done, just adding a test here
Merge branch 'CAMEL-7498' of https://github.com/kevinearls/camel