Merge changes to branch

svn path=/branches/build/Milestone_12/build/v2/; revision=39604
Merge test fixes from trunk

svn path=/branches/build/Milestone_12/build/v2/; revision=39625