Merge pull request #590 from ohtutraininghub/586/fix/move_components_… #1161

Job	Run time
smoke-test / smoke-test	1m 54s
e2e-test / e2e-test	6m 39s
unit-test / unit-test	1m 43s
staging-deploy / heroku-deploy	3m 47s
	14m 3s

Provide feedback