CAMEL-6041 merged the patch into camel-2.10.x branch