Merge "replace incorrect strscpy use in FORTIFY_SOURCE"