Merge change I85e5d39e into eclair-mr2

* changes:
  Two more uses of strlcpy that break the sim build. Now fixed.