Move the JSF-ManagedBeans, EJB to CDI-ManagedBeans.
Merge branch 'migrate-to-cdi'
Migration to CDI.