FORGE-1946: Upgraded to Weld 2.2.5.Final and CDI 1.2