Merge remote-tracking branch 'origin/feature/cas/speed-editor' into feature/cas/speed-editor

cms/djangoapps/contentstore/tests/tests.py

@@ -458,5 +458,6 @@ class ContentStoreTest(TestCase):
         # should be a CapaDescriptor
         self.assertIsInstance(problem, CapaDescriptor, "New problem is not a CapaDescriptor")
         context = problem.get_context()
-        self.assertIn('markdown', context, "markdown is missing")
+        self.assertIn('markdown', context, "markdown is missing from context")
+        self.assertIn('markdown', problem.metadata, "markdown is missing from metadata")
         self.assertNotIn('markdown', problem.editable_metadata_fields, "Markdown slipped into the editable metadata fields")
\ No newline at end of file