Close GH Issue 69
Close GH PR 457
Some other updates

By Rich Salz, Alessandro Ghedini, Steve Marquess, Collin Anderson
Reviewed-by: NKurt Roeckx <kurt@openssl.org>