Merge "Fix Pushkin Notification service metadata"