SP-651 BIS-422 user settings are saved with a popup

SVN: 29247

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PersonDAO.java

@@ -123,7 +123,7 @@ public final class PersonDAO extends AbstractGenericEntityDAO<PersonPE> implemen
             {
                 person.getPersonDisplaySettings().setId(person.getId());
             }
-            template.update(person.getPersonDisplaySettings());
+            template.merge(person.getPersonDisplaySettings()); // cannot be update - look below
         }
         template.merge(person); // WORKAROUND update cannot be used - see LMS-1603
         template.flush();