SMX4-1389: Upgrade to Camel 2.10.4

git-svn-id: https://svn.apache.org/repos/asf/servicemix/smx4/features/trunk@1453591 13f79535-47bb-0310-9956-ffa450edef68
Fix build on MacOS/JDK7

git-svn-id: https://svn.apache.org/repos/asf/servicemix/smx4/features/trunk@1453592 13f79535-47bb-0310-9956-ffa450edef68