Define strlcpy on platforms that do not have it
Merge commit 'a0683b8' into merge2