slingshot: sync with upstream.

* slingshot: Sync with upstream.
* bootstrap: Sync with slingshot.

Signed-off-by: Gary V. Vaughan <gary@gnu.org>