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

* origin/swift-3.0-branch:
  Revert "Modules: add command line option fmodules-disable-diagnostic-validation"
  Revert "Modules: follow up to r276769."