Submitting fix for CAMEL-6809 - Ignore the header that is already on the message and just use the exchangename of the endpoint.
Tidy up eclipse auto-format