Merge "Don't set sehash when calling restoreconRecursive"