Merge "Consistently use SHA256 for filenames (previously, MD5 and SHA1 were used)." into nyc-dev