MSBuild updates to support better property override naming conventions
BugFix for msbuild property closing tag