Add missing dependency.
Add COLLECTION_POLICY to root collection.

Also, squash references to "Adding a subcollection," as it's now
handled through the collection solution pack.
Code review fixes.