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

* origin/swift-3.1-branch:
  Swift Calling Convention: Parameters are allowed after the swift_error/swift_context parameter
  Pass the end of a component to SwiftAggLowering's enumerateComponents callback