Merge branch 'main' of github.com:aws/amazon-s3-encryption-client-jav…

Merge branch 'main' of github.com:aws/amazon-s3-encryption-client-jav… #2560