Resolving conflicts
Add OpenEJB setup and initial test for EJBs
Using the released TomEE version
Fixing SCM error
Merge branch 'OpenEJB'