Fixed copy/paste leftover for AwsS3ResolverFactoryTest
Merge branch 's3-cache-control' into improved