Upgrade to CDI API 1.1-PFD