Merge proposals dependent on lp://staging/~gmb/launchpad/remove-bug-heat-from-garbo-daily-bug-511283

1. remove-bug-heat-from-garbo-daily-bug-511283
2. Dependent merge proposals