[cdi-dev] Spec. realigned with current goals and current features