AGPUSH-282

Linked to https://github.com/aerogear/aerogear-unifiedpush-server/pull/118