Feature 4474

Migrating all EJB from 2.1 to 3.1