Tweaked generated paths for ExternalStoreMwstore

* This improve the object store case (with B-Tree container listings
  and 2-level sharding set up).

Change-Id: If75f51fb07cd5df0da455d4e6eafe06d69e8b941
Merge "Tweaked generated paths for ExternalStoreMwstore"