More miscellaneous updates to version negotiation following feedback.
Reviewed-by: NKurt Roeckx <kurt@openssl.org>