Merge branch 'release/3.6.0' into camel-karaf-3.6.x