Moved around values in this header so that at least the int value would match the shipping branch
Merge in changes to remove code that uses OpenSSL.