SR-7038: cherry-pick the remaining fixes for Swift 4.1#14937

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

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