doc store changes
Changes to support docstore in a backward compatible fashion.
adding collection param.
Merge pull request #330 from edx/e0d/docstore

MERGE_WITH_CAUTION: E0d/docstore