[aerogear-issues] [JBoss JIRA] (AEROGEAR-8318) [Server] Build conflict resolution interfaces