merged from trunk

svn path=/branches/proto/v4/tools/bcp/; revision=48605
merged from trunk

svn path=/branches/proto/v4/tools/bcp/; revision=49439
merged from trunk

svn path=/branches/proto/v4/tools/bcp/; revision=49607