Make canada mapping work with current implementation of mapper
Add a blank json as produced from json-schema-random
Pretty print the json
Merge upstream.