Merge proposals dependent on lp://staging/~edwin-grubbs/launchpad/bug-35728-bugtracker-overlay

1. bug-35728-bugtracker-overlay
2. Dependent merge proposals