Include unstructured event fields in the canonical output
Tidy up other Cloudfront line tests
Include both unstructured event name and JSON payload in Redshift schema until the payload is handled separately