Merge "Retain file length and mod time when doing a mixed reset" into stable-2.0