Merge proposals dependent on lp://staging/~wgrant/launchpad/bug-540819-fix-builder-list-icons

1. bug-540819-fix-builder-list-icons
2. Dependent merge proposals