Merge pull request #23770 from dmatej/fix-ejb-tests

Fixed ejb tests + Fixed generating EJB classes