JBIDE-15628 : harden CDI 1.1 support

Signed-off-by: Fred Bricon <fbricon@gmail.com>