Fix for CAMEL-6513  and CAMEL-6937

Makes weld 2.1.0 work and stop usage of beanprovider in extension to avoid error caused by bad bean resolution