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

* origin/swift-4.0-branch:
  Re-apply "[ubsan] Sanity-check shift amounts before truncation"