Revert the two more complex packages to build from NUSPEC rather than from CSPROJ
Merge branch 'dev'
Changelist