Merge branch 'feature/diana/rubric-input' into diana/open-ended-ui-updates

Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/self_assessment_module.py

common/lib/xmodule/xmodule/combined_open_ended_module.py

@@ -140,7 +140,7 @@ class CombinedOpenEndedModule(XModule):
         # completion (doesn't matter if you self-assessed correct/incorrect).
         self._max_score = int(self.metadata.get('max_score', MAX_SCORE))
 
-        rubric_renderer = CombinedOpenEndedRubric(self.system, True)
+        rubric_renderer = CombinedOpenEndedRubric(system, True)
         success, rubric_feedback = rubric_renderer.render_rubric(stringify_children(definition['rubric']))
         if not success:
             error_message="Could not parse rubric : {0}".format(definition['rubric'])

common/lib/xmodule/xmodule/self_assessment_module.py

@@ -123,7 +123,6 @@ class SelfAssessmentModule(openendedchild.OpenEndedChild):
             return ''
 
         rubric_renderer = CombinedOpenEndedRubric(system, True)
-
         success, rubric_html  = rubric_renderer.render_rubric(self.rubric)
 
         # we'll render it