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

* origin/swift-3.1-branch:
  [Sema] Display an objc_subclassing_restricted error for Objective-C implementation declarations when appropriate.