Revert "Bug 1021152: upgrade OpenSSL on Ubuntu; r=dividehex"
Merge default -> production