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

* origin/swift-4.0-branch:
  [PCH] Fix a regression when PCH is used with -fmodules