Merge change Iaf1f0918 into eclair-mr2

* changes:
  Implement API to have new broadcasts replace existing broadcasts.