Merge "[FileRepo] Added support for temp file repos (to preserve our thumb.php hack)."