Merge proposals dependent on lp://staging/~matsubara/launchpad/bug-606184-pageid-for-collections

1. bug-606184-pageid-for-collections
2. Dependent merge proposals