Merge proposals dependent on lp://staging/~allenap/launchpad/ui-convert-bug-tracker-3.0-bug-418155-pt3

1. ui-convert-bug-tracker-3.0-bug-418155-pt3
2. Dependent merge proposals