Editor's drafts for gunter-van-de-velde-review branch of core-wg/oscore-edhoc