Merge branch 'stable-3.6' into stable-3.7

* stable-3.6:
  Expire the owners cache after 1 minute and make it unlimited
  Optimize the 'path_owners_entries' cache eviction
  Introduce PathOwners cache from Ic7d61de07

Change-Id:  Ia79257fe2e9c76c0c1285187bf7c88649f135c62