Fixups for 9.2

See commit log for details on changes.
We have custom error codes for a range of situations.  If you don't consider INADEQUATE_SECURITY to require different handling to PROTOCOL_ERROR, you are able to treat them identically at your discretion.  In the same way that you might choose to treat COMPRESSION_ERROR and PROTOCOL_ERROR identically.