CONN-727: Fixed EJB-Spring circular referencing