libindicator

Merge proposals dependent on lp://qastaging/~charlesk/libindicator/fix-test-sources

  1. fix-test-sources
  2. Dependent merge proposals

lp://qastaging/~charlesk/libindicator/fix-test-sources has no merge proposals.