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

* origin/swift-3.1-branch:
  [analyzer] Add more FileIDs to PlistDiagnostic map to avoid assertion
  [analyzer][test commit] ExprEngine.cpp: Remove training whitespace; NFC
  [analyzer] Use lazily created buffer in EmptyLocalizationContextChecker