Merge proposals dependent on lp://staging/~cjohnston/qa-dashboard/remove-code-goodness

lp://staging/~cjohnston/qa-dashboard/remove-code-goodness has no merge proposals.