opps
Merge branch 'testing_log' into AWS
more timeout and more logging
Merge branch 'testing_log' into AWS