am f4eb754b: am 2a428fd4: Merge change I85e5d39e into eclair-mr2

Merge commit 'f4eb754b1810a60e640401396c1f9a10be65dffa'

* commit 'f4eb754b1810a60e640401396c1f9a10be65dffa':
  Two more uses of strlcpy that break the sim build. Now fixed.