Backport VSIX packaging support and related changes.