Autolander test, add bar.txt
Merge branch2 into integration-master
Merge integration-master into master