Merge proposals dependent on lp:~indicator-applet-developers/indicator-appmenu/catch-xerrors-correctly

1. catch-xerrors-correctly
2. Dependent merge proposals