SWC-1250: fix concurrent update handling, and edit state when there is an error on save
Merge pull request #879 from jay-hodgson/SWC-1250

SWC-1250: fix concurrent update handling, and edit state when there is an error on save