fixed build script, fixed version information in Manfiest file
Merge branch 'master' into deploy
build 30510