Fix hanging test

This is just to get the builds passing again.  Need to do work
to figure out why the thread hangs.
Merge branch 'fix-hanging-s3-test' into develop

* fix-hanging-s3-test:
  Fix hanging test