Bug 1006030 - add foo.txt
Merge branch1 into integration-master