RF-13582: Refactored the cdi package names in teh CDI Extension SPI file