Decide CoC upstream version and modifications #1049
Description
We've had a number of conversations on changes we'd like to incorporate for ourselves downstream from the Contributor's Covenant Code of Conduct. Let's pull in comments from previous PRs/issues as well as any undocumented concerns and decide how to move forward now that the tooling/patching part of this effort is almost complete.