Revert CDI 1.2 due to annoyingly strict EE TCK rules

We need to get 8.1 out, so have to revert this. Will create a 8.2 shortly after this.