Insight camel fixes

Fix for:

https://issues.jboss.org/browse/MR-927
https://issues.jboss.org/browse/ENTESB-1652