Revert "Revert "Denormalise and copy app_id to deliveries as well""

This reverts commit 4fc0d6e7dbd612b7b332985dbaa0e4c22a6daf1a.