resolve conflicts and re push, ref draft3 to draft4#55

jviotti merged 2 commits intomainjson-schema-org/upgrade-downgrade-rules:mainfrom

new/ref_draft3To4json-schema-org/upgrade-downgrade-rules:new/ref_draft3To4Copy head branch name to clipboard