https://issues.apache.org/jira/browse/CAMEL-6748
fix #4 and #5
some fixes
update
cleanup