bootstrap: sync with upstream.
bootstrap: sync with upstream.

* bootstrap: Pick up some bugfixes and enhancements from earlier
today.

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

gvvaughan/slingshot