Numerous conflicts resolved. rebase was against commit 490469f850.
Reviewed-by: NRichard Levitte <levitte@openssl.org>