Indicators Client

Merge proposals dependent on lp://staging/~sil2100/indicators-client/fixes_for_the_masses

  1. fixes_for_the_masses
  2. Dependent merge proposals

lp://staging/~sil2100/indicators-client/fixes_for_the_masses has no merge proposals.