Update previous patches to match for 2.4.
Revert the default use of "rfc4880bis" (v5) as it is incompatible with the IETF ratified "crypto-refresh" (v6) and other
implementations.