V1.5.x camel 2.10.0

This pull requests also contains commits that related to build issues discovered after v1.5.1.