🔀 Merge branch 'FH-3821' into rhmap
🔀 Merge branch 'FH-3821' into rhmap

fheng/aerogear-unifiedpush-server,fheng/aerogear-unifiedpush-server,fheng/aerogear-unifiedpush-server,fheng/aerogear-unifiedpush-server,fheng/aerogear-unifiedpush-server,fheng/aerogear-unifiedpush-server