spec: 495537-8, 567749-50 refactor
spec: 495537-8, 567749-50 refactor

Change-Id: I7a1bd54eae3866b96d52b29616e376aee4f84edf
Reviewed-on: https://gerrit.instructure.com/69057
Tested-by: Jenkins
Reviewed-by: Gentry Beckmann <f487939f789774cca922ca5b886632de73477ea0@instructure.com>
Product-Review: Gentry Beckmann <f487939f789774cca922ca5b886632de73477ea0@instructure.com>
QA-Review: Gentry Beckmann <f487939f789774cca922ca5b886632de73477ea0@instructure.com>

roxolan/canvas-lms,dgynn/canvas-lms,djbender/canvas-lms,matematikk-mooc/canvas-lms,sfu/canvas-lms,grahamb/canvas-lms,grahamb/canvas-lms,instructure/canvas-lms,fronteerio/canvas-lms,HotChalk/canvas-lms,HotChalk/canvas-lms,redconfetti/canvas-lms,SwinburneOnline/canvas-lms,dgynn/canvas-lms,roxolan/canvas-lms,dgynn/canvas-lms,instructure/canvas-lms,sfu/canvas-lms,venturehive/canvas-lms,SwinburneOnline/canvas-lms,matematikk-mooc/canvas-lms,sfu/canvas-lms,matematikk-mooc/canvas-lms,redconfetti/canvas-lms,SwinburneOnline/canvas-lms,venturehive/canvas-lms,roxolan/canvas-lms,venturehive/canvas-lms,sfu/canvas-lms,instructure/canvas-lms,HotChalk/canvas-lms,sfu/canvas-lms,djbender/canvas-lms,grahamb/canvas-lms,roxolan/canvas-lms,instructure/canvas-lms,sfu/canvas-lms,matematikk-mooc/canvas-lms,djbender/canvas-lms,grahamb/canvas-lms,fronteerio/canvas-lms,instructure/canvas-lms,HotChalk/canvas-lms,grahamb/canvas-lms,venturehive/canvas-lms,fronteerio/canvas-lms,instructure/canvas-lms,instructure/canvas-lms,dgynn/canvas-lms,redconfetti/canvas-lms,sfu/canvas-lms,redconfetti/canvas-lms,djbender/canvas-lms,fronteerio/canvas-lms,SwinburneOnline/canvas-lms