am 243a026b: Merge "Second attempt at avoiding infinite loop in PathCache::trim() Bug #10347089" into klp-dev

* commit '243a026b89bfe0b7b549665882d053c40ab0785f':
  Second attempt at avoiding infinite loop in PathCache::trim() Bug #10347089