(COMMIT-37) JPA configuration changes