Fixups for 9.2

See commit log for details on changes.
Perhaps "select or allow" rather than "offer or select"; "offer" implies that clients can't include other cipher suites, which contradicts the text below.