Updating EX-60 logic
Merge pull request #5035 from edx/asadiqbal08/EX_60_updation_for_test_failure_issue

(WIP) Updating EX-60 & test failure handling