During testing: drop contentstore when cleaning up modulestore
Merge pull request #2111 from edx/dhm/drop_contentstore

During testing: drop contentstore when cleaning up modulestore