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

* origin/swift-4.0-branch:
  Revert "[profiling] Update test cases to deal with name variable change (NFC)"