Merge change I53e3a20e into eclair-mr2

* changes:
  move SubscribedFeeds to GSF