Update primary branch to 'main'

[Christopher-Chappell]

This folds in changes to support internal builds and allows us to rename the master branch to main (once merged).