Revert "Merge pull request #6228 from mkouba/weld-classfileservices-test-fix"

This reverts commit 4056c916e6faa7583b0880555ed0e042fcdd7156, reversing
changes made to 9bb2f222278bdf0a803717b5634275749a694342.
Revert "Merge pull request #6223 from jharting/weld22-wf8"

This reverts commit 401e5cc2e883aa4d83e80751aa81abe52cdd4aec, reversing
changes made to 4e5271d07ace06e19745b933f9141f718bdce1b5.
Merge pull request #6253 from n1hility/master

Revert CDI 1.2 due to annoyingly strict EE TCK rules