Various adjustments for new directory structure.
Further adjustments for new directory structure.
Adding upload switch to load_test_data.sh script.
Merge branch 'branch-1-0'