Merge pull request #2248 from apache/remove-externals

Remove "externals"