Merge proposals dependent on lp://staging/~bluesabre/indicator-messages/indicator-messages-gtk2

1. indicator-messages-gtk2
2. Dependent merge proposals