Move everything possible under the catch-all
Move everything possible under the catch-all

References OUT-2877

Test Plan:
:qa-cr:

Change-Id: I47356944ddc4da23f99cf6235343f55668044d42
Reviewed-on: https://gerrit.instructure.com/173302
Tested-by: Jenkins
Reviewed-by: Augusto Callejas <7d9b9fd126d23d111f693e51511b33ea0e7192f6@instructure.com>
QA-Review: Brian Watson <4411c2aac809443ec63e2dd517de0f2dbc7408c6@instructure.com>
Product-Review: Frank Murphy III <ed7a7068a7b39653c9ca1c429cffcb87c4a069c6@instructure.com>

instructure/canvas-lms,sfu/canvas-lms,djbender/canvas-lms,sfu/canvas-lms,instructure/canvas-lms,instructure/canvas-lms,instructure/canvas-lms,sfu/canvas-lms,djbender/canvas-lms,djbender/canvas-lms,instructure/canvas-lms,instructure/canvas-lms,sfu/canvas-lms,sfu/canvas-lms,instructure/canvas-lms,sfu/canvas-lms,djbender/canvas-lms,sfu/canvas-lms