improved update (merge) handling  in JPA