use the quiz question value from the assessment if present
use the quiz question value from the assessment if present

closes #3746

Change-Id: Id391ba65749860fede1e4fc16b0a8969f497eedd
Reviewed-on: https://gerrit.instructure.com/2215
Tested-by: Hudson <dfb64870173313a9a7b56f814c8e3b33e268497a@instructure.com>
Reviewed-by: JT Olds <0857133ffcd232122dc51ad55bf5fcc9d60af5d3@instructure.com>

fronteerio/canvas-lms,nditech/red-innovadores-lms,shidao-fm/canvas-lms,djbender/canvas-lms,Unow/ins,sfu/canvas-lms,Unow/ins,skmezanul/canvas-lms,juoni/canvas-lms,snehakachroo1/LSI_replica,faraazkhan/canvas,grahamb/canvas-lms,instructure/canvas-lms,eCNAP/CANVAS,wrdsb/canvas-lms,ankithbti/canvas_lms,tgroshon/canvas-lms,utkarshx/canvas-lms,matematikk-mooc/canvas-lms,Rvor/canvas-lms,faraazkhan/canvas,wrdsb/canvas-lms,HotChalk/canvas-lms,nditech/red-innovadores-lms,wye0220/shindig-canvas,narigone/canvas,AndranikMarkosyan/lms,grahamb/canvas-lms,samuels410/greatlakes-lms,icelab/canvas,sdeleon28/canvas-lms,jay3126/canvas-lms,va7map/canvas-lms,whalejasmine/canvas-lms,efrj/canvas-lms,ottenhoff/canvas-lms,juoni/canvas-lms,sdeleon28/canvas-lms,tgroshon/canvas-lms,Rvor/canvas-lms,arrivu/jigsaw-lms,sfu/canvas-lms,landonwilkins/canvas-lms,wye0220/shindig-canvas,wimemx/Canvas,samuels410/greatlakes-lms,ShreniiNepal/shrenii_lmp,antoniuslin/canvas-lms,matematikk-mooc/canvas-lms,arrivu/hoodemo,skmezanul/canvas-lms,loganrun/pincan,whalejasmine/canvas-lms,shidao-fm/canvas-lms,ottenhoff/canvas-lms,Jyaasa/canvas-lms,snehakachroo1/LSI_replica,narigone/canvas,sli7246/canvas_branch,arrivu/arrivu-lms,icelab/canvas,efrj/canvas-lms,gbleydon/canvas-lms,fronteerio/canvas-lms,sli7246/canvas_branch,em2/canvas-lms,faraazkhan/canvas,roxolan/canvas-lms,efrj/canvas-lms,rup/Tarrax,arrivu/arrivu-lms,greyhwndz/canvas-lms,juoni/canvas-lms,Unow/canvas-lms,redconfetti/canvas-lms,djbender/canvas-lms,sdeleon28/canvas-lms,wrdsb/canvas-lms,tgroshon/canvas-lms,shidao-fm/canvas-lms,HotChalk/canvas-lms,loganrun/pincan,wrdsb/canvas-lms,arrivu/hiring-site,antoniuslin/canvas-lms,venturehive/canvas-lms,sfu/canvas-lms,greyhwndz/canvas-lms,sfu/canvas-lms,greyhwndz/canvas-lms,merichar/canvas-lms,usmschuck/canvas,whalejasmine/canvas-lms,grahamb/canvas-lms,ottenhoff/canvas-lms,shidao-fm/canvas-lms,nditech/red-innovadores-lms,Rvor/canvas-lms,HotChalk/canvas-lms,eCNAP/CANVAS,va7map/canvas-lms,usmschuck/canvas,SwinburneOnline/canvas-lms,sfu/canvas-lms,utkarshx/canvas-lms,ShreniiNepal/shrenii_lmp,roxolan/canvas-lms,arrivu/qibla-ecampus,sfu/canvas-lms,landonwilkins/canvas-lms,kyroskoh/canvas-lms,instructure/canvas-lms,arrivu/jigsaw-lms,matematikk-mooc/canvas-lms,redconfetti/canvas-lms,narigone/canvas,ShreniiNepal/shrenii_lmp,arrivu/qibla-ecampus,AndranikMarkosyan/lms,SwinburneOnline/canvas-lms,parbros/red-innovadores-lms,parbros/red-innovadores-lms,leftplusrightllc/canvas-lms,grahamb/canvas-lms,instructure/canvas-lms,merichar/canvas-lms,samuels410/greatlakes-lms,eCNAP/CANVAS,dgynn/canvas-lms,dgynn/canvas-lms,AndranikMarkosyan/lms,ShreniiNepal/shrenii_lmp,instructure/canvas-lms,whalejasmine/canvas-lms,snehakachroo1/LSI_replica,juoni/canvas-lms,parbros/red-innovadores-lms,va7map/canvas-lms,icelab/canvas,wimemx/Canvas,jay3126/canvas-lms,djbender/canvas-lms,SwinburneOnline/canvas-lms,samuels410/greatlakes-lms,efrj/canvas-lms,merichar/canvas-lms,arrivu/hiring-site,arrivu/arrivu-lms,HotChalk/canvas-lms,djbender/canvas-lms,grahamb/canvas-lms,utkarshx/canvas-lms,greyhwndz/canvas-lms,arrivu/jigsaw-lms,jay3126/canvas-lms,antoniuslin/canvas-lms,usmschuck/canvas,venturehive/canvas-lms,venturehive/canvas-lms,leftplusrightllc/canvas-lms,redconfetti/canvas-lms,dgynn/canvas-lms,wye0220/shindig-canvas,matematikk-mooc/canvas-lms,instructure/canvas-lms,narigone/canvas,AndranikMarkosyan/lms,instructure/canvas-lms,SwinburneOnline/canvas-lms,eCNAP/CANVAS,sfu/canvas-lms,usmschuck/canvas,kyroskoh/canvas-lms,fronteerio/canvas-lms,snehakachroo1/LSI_replica,landonwilkins/canvas-lms,sdeleon28/canvas-lms,roxolan/canvas-lms,rup/Tarrax,wimemx/Canvas,gbleydon/canvas-lms,Rvor/canvas-lms,Jyaasa/canvas-lms,sli7246/canvas_branch,ankithbti/canvas_lms,em2/canvas-lms,antoniuslin/canvas-lms,em2/canvas-lms,Unow/canvas-lms,arrivu/hoodemo,leftplusrightllc/canvas-lms,redconfetti/canvas-lms,arrivu/hiring-site,roxolan/canvas-lms,ankithbti/canvas_lms,Unow/canvas-lms,arrivu/hoodemo,kyroskoh/canvas-lms,rup/Tarrax,Jyaasa/canvas-lms,Unow/ins,landonwilkins/canvas-lms,skmezanul/canvas-lms,venturehive/canvas-lms,instructure/canvas-lms,loganrun/pincan,nditech/red-innovadores-lms,skmezanul/canvas-lms,va7map/canvas-lms,leftplusrightllc/canvas-lms,tgroshon/canvas-lms,fronteerio/canvas-lms,Jyaasa/canvas-lms,utkarshx/canvas-lms,dgynn/canvas-lms,gbleydon/canvas-lms,arrivu/qibla-ecampus,kyroskoh/canvas-lms,jay3126/canvas-lms