Merge pull request #1822 from MITx/fix/cdodge/add-more-container-types-to-inherit-through

extend the list of container module names to our comuputation of inherit...

common/lib/xmodule/xmodule/modulestore/mongo.py

@@ -258,11 +258,11 @@ class MongoModuleStore(ModuleStoreBase):
 
         # get all collections in the course, this query should not return any leaf nodes
         # note this is a bit ugly as when we add new categories of containers, we have to add it here
-        query = {
-                    '_id.org': location.org,
-                    '_id.course': location.course,
-                    '_id.category': {'$in': ['course', 'chapter', 'sequential', 'vertical']}
-                }
+        query = {'_id.org': location.org,
+                 '_id.course': location.course,
+                 '_id.category': {'$in': ['course', 'chapter', 'sequential', 'vertical',
+                                          'wrapper', 'problemset', 'conditional']}
+                 }
         # we just want the Location, children, and inheritable metadata
         record_filter = {'_id': 1, 'definition.children': 1}