am 86ffa1cd: am 5da7ec4f: Merge "Follow symlinks in findleaves"

* commit '86ffa1cd63ede2c8b923d124aca9adab5aaca260':
  Follow symlinks in findleaves