CORE-222 Report error in delete modal
Reworded etag conflict message
Merge pull request #1856 from reciprocity/feature/delete-modal-conflict

CORE-222 Report error in delete modal