Fix for CAMEL-6513

Have Camel-CDI play better with Weld 2.0. But tests don't pass yet on Weld 2. They are ok for Weld 1 and OWB.