Conflicts: openassessment/assessment/api/self.py openassessment/xblock/self_assessment_mixin.py openassessment/xblock/test/test_self.py
