Merge "Avoid double word-separator when using Linker::userToolLinks"