Import improvements from cryptography wheel building and release

Import improvements from cryptography wheel building and release #1295