Merge branch 'release/3.11.6' into camel-karaf-3.11.x