Merge PCbuild/pcbuild.sln cleanup from 3.4