[aerogear-issues] [JBoss JIRA] (AGPUSH-368) Backport AGPUSH-329 to 0.8.1