[aerogear-issues] [JBoss JIRA] (AGPUSH-983) Synchronize changes required by product with master