Merge proposals dependent on lp://qastaging/~cjohnston/qa-dashboard/canonistack-staging-settings

1. canonistack-staging-settings
2. Dependent merge proposals