SR-7038: cherry-pick the remaining fixes for Swift 5.0#14938

bob-wilson merged 2 commits intoswiftlang:swift-5.0-branchswiftlang/swift:swift-5.0-branchfrom

bob-wilson:rdar37710244-5.0bob-wilson/swift:rdar37710244-5.0Copy head branch name to clipboard