am 1705d87b: am bfea1e13: resolved conflicts for merge of f585be7f to eclair-mr2

Merge commit '1705d87b7e576bcd3bdc670411511376b4e245c5'

* commit '1705d87b7e576bcd3bdc670411511376b4e245c5':
  A few more testcases for the vendor to reproduce issues with their decoder. Not part of the shipping image.