Sync and fix bugs in v2 context.#1259

msporny merged 2 commits intomainw3c/vc-data-model:mainfrom

msporny-fix-base-contextw3c/vc-data-model:msporny-fix-base-contextCopy head branch name to clipboard