[aerogear-issues] [JBoss JIRA] (AGPUSH-2205) Rebase GSOC branch of master