Switch s3_website and filey-diff to fast-diff branch

[#69671476]