Merge proposals dependent on lp://staging/~allenap/launchpad/ui-convert-bugtarget-x-3.0-bug-427755

1. ui-convert-bugtarget-x-3.0-bug-427755
2. Dependent merge proposals