I suggest merging in the following order. As each one is merged, I'll update the next one to merge cleanly with master. Please email me or comment in Github when each of them is accepted.
https://github.com/apache/camel/pull/321 https://issues.apache.org/jira/browse/CAMEL-8008 (should not cause merge conflicts for the next change) https://github.com/apache/camel/pull/340 https://issues.apache.org/jira/browse/CAMEL-8116 https://github.com/apache/camel/pull/323 https://issues.apache.org/jira/browse/CAMEL-8117 Not yet ready to be merged: https://github.com/apache/camel/pull/317 https://issues.apache.org/jira/browse/CAMEL-8002 - waiting for jsmpp to accept my pull request too - will need some tweaks after merging the other pull requests
