Merge "Add option to expose original sha1 in thumb url"

diff --cc includes/filerepo/FileRepo.php
Simple merge

diff --cc includes/filerepo/LocalRepo.php
Simple merge

diff --cc includes/filerepo/file/File.php
Simple merge