Merge change Ia6446890 into eclair-mr2

* changes:
  Remove the IM provider contract class.