CDI-3 Update assertions
CDI-321 Update assertions for application wide CDI enablement