Merge change I707f53cd into eclair-mr2

* changes:
  LightsService cleanup: