Remove SVN 'trunk' artifacts from direcotory structure
Fix build due to new optional parameter bug in SHARP_ADD_MSBUILD_PROJECT.
Remove one level from some relative paths due to remove trunk form directory structure.