974: Fix issue with wrong payload for GCM / APNS / template
Merge pull request #975 from andrerod/fix_notifications

974: Fix issue with wrong payload for template notifications