Revision 1870786

Merge the r1870393 group from trunk:

 * r1870393, r1870395
   Fix issue #4837 'Cannot get info for a file that was
   inside of file-replaced directory'.
   Justification:
     Regression introduced in 1.10.0.
   Votes:
     +1: julianfoad, rhuijben, jamessan