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

* origin/swift-3.1-branch:
  [index] Rename SymbolSubKind -> SymbolProperty, NFC.