Changed so that existing email and external identifier entity objects from Hibernate are reused in JAXB to JPA conversion.