[rules-users] Improve JPA persistence JIRA