FS-11303: [Build-System] Migrate Visual C++ components redistribution using merge modules from v140 to v141 (VS2017), minor cleanup.