CONN-727: EJB Fixes

Fixed EJB / Spring Bean circular references.