Fix unit tests
Merge branch 'feature-ENT-652' into Camel-2.10.6-EP-Veracode