Merge branch 'release/3.5.0' into camel-karaf-3.5.x