Edits for "conventions" and impersonal form#628

JonathanGregory merged 3 commits intocf-convention:maincf-convention/cf-conventions:mainfrom

pvanlaake:mainpvanlaake/cf-conventions:mainCopy head branch name to clipboard