[aerogear-issues] [JBoss JIRA] (AEROGEAR-8124) Investigate locking mechanism for versions in conflict resolution