[weld-dev] CDI TCK code style changes