Merge proposals dependent on lp://qastaging/~mabac/launchpad-work-items-tracker/better-error-contacts

1. better-error-contacts
2. Dependent merge proposals