NR-607 : Unable to save user changes

fixed
Merge branch 'devel' of dev.sourcefabric.org:superdesk into devel