[CAMEL-6195] Applied Christian's patch with minor updates for CS compliance and completeness.

git-svn-id: https://svn.apache.org/repos/asf/camel/trunk@1459393 13f79535-47bb-0310-9956-ffa450edef68