Merged revisions 1146608 via svnmerge from https://svn.apache.org/repos/asf/camel/branches/camel-2.8.x