Merge in ECC and Negotiated FF-DHE