[CLC-1720] Roll up fixes into QA:

JIRA: https://jira.media.berkeley.edu/jira/browse/CLC-1720