[aerogear-issues] [JBoss JIRA] (AEROGEAR-9589) Conflict changes required to work with showcase