Merge "openssl-1.0.1e upgrade"