Revert "Bug 1021152: upgrade OpenSSL on Ubuntu; r=dividehex"
Merge branch 'master' of https://github.com/mozilla/build-puppet into runner-ubuntu