Merge remote-tracking branch 'origin/swift-4.0-branch' into stable

* origin/swift-4.0-branch:
  Use correct fix-it location for -Wblock-capture-autoreleasing