Waheed/ora72 consistent rubric scores

ORA-72
https://github.com/edx/edx-platform/pull/1837

Rebased against release.