bootstrap: sync with upstream.

* bootstrap: Pick up recent fixes from upstream.

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