Bug 1085552: upgrade OpenSSL on Ubuntu; r=rail
Merge default -> production