Fixup some import related warnings#1557

ahoppen merged 2 commits intoswiftlang:mainswiftlang/sourcekit-lsp:mainfrom

plemarquand:fix-import-warningsplemarquand/sourcekit-lsp:fix-import-warningsCopy head branch name to clipboard