Required changes to get 'only mine' behavior in collection listing.
Merge branch 'master' into staging

* master:
  Required changes to get 'only mine' behavior in collection listing.