JBIDE-13739 : allow CDI support to be disabled

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