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

* origin/swift-3.1-branch:
  [index] Handle properly C++14's template variables.
  [index] Make sure to mark class template symbols as having 'generic' sub-kind.