Created attachment 1026885 [details]
Stack trace on server when a user tries to save editor options.

Description of problem:
When save button is clicked in editor options panel, a warning message is shown with "Could not save user options". The stack trace on the server shows a ClassCastException trying to cast from

    org.hibernate.action.internal.EntityIdentityInsertAction
    org.hibernate.action.internal.EntityInsertAction


Version-Release number of selected component (if applicable):


How reproducible:
Easy, always

Steps to Reproduce:
1. Sign in and open the editor for any document
2. Expand the user options panel
3. Click "Save" at the bottom of the user options panel

Actual results:
Message shows "Could not save user options"


Expected results:
User options save successfully and can be restored by clicking "Load"

Additional info:
Stack trace from the server is attached.