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

* origin/swift-3.1-branch:
  Fix spelling mistake.
  [Sema] Avoid instantiating templates only when UncompilableErrorOccurred and FatalErrorOccurred are both set.
  Revert "[index] Handle properly C++14's template variables."