Back to EclipseLink due to several issues with OpenJPA