MDL-36331 core_grade: fixed up 2 incorrect default return URLs