Project editor: misleading conflict modal when saving changes

Description of problem:
When saving changes made to a project for the second time, user gets Conflict Error modal: "User has updated the following resource default://master@<repo>/<project>/pom.xml."
1st and main issue is that only this one user was making the changes and so there is no conflict.
2nd issue is that the Conflict Error modal message doesn't specify which user has made the changes.

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

Steps to Reproduce:
1. Open the Project Editor.
2. Change project version and save.
3. repeat step 2.

Actual results:
Error modal warning about a conflict.

Expected results:
Changes are saved, no conflict.
(In case of actual conflict, the message informs which user has made the changes as well.)