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

* origin/swift-3.1-branch:
  [asan] Allow re-exec in instrumented unit tests on Darwin (fix unit tests on macOS <=10.10)