Reviewed-by: Tim Hudson <tjh@openssl.org>
RT: 2582, 2850 (cherry picked from commit ca48ace5c5) Conflicts: Configure
ca48ace5c5