refactor jdong's s3 work
Merge branch 'slank-s3' into EOPS-6008
savepoint