Update wheel scripts to match what Jenkins has (#3459)

* Include python3.6 in the macOS wheel script

* Pull in changes from Jenkins

* For Windows as well
2 files changed