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