Merge EVP changes in from FIPS branch.