[cdi-dev] Preparing CDI 2.0