Import improvements from cryptography wheel building and release (#840)

Import improvements from cryptography wheel building and release (#840) #1304