[aerogear-issues] [JBoss JIRA] (AEROGEAR-9332) Refactor Conflict link to handle new requirements