[Bug 691780] Apply proposed Trademark Guidelines changes to the wiki page