[tmp] Propagated changes to net40

* Propagated changes from last commit to .NET 4.0 directory.

* The .NET 4.5 solution was missing some changes.