BVAL-352 Improve wording related to CDI

@emmanuelbernard: I'm not exactly sure what you had in mind. Pls. have a look.