JPA code cleanup, should be using merge instead of persist of changes to managed objects