Fixed bug in build script (adding properties to wrong dictionary for custom build).
Merge branch 'bug_fix_in_build_ps1'