Merge in recent changes from wix3.

This includes all commits since 3.9.901, except for the commit related to setting up v3.10.  Also doesn't include commits which have a corresponding pull request in wix4.