slingshot: resync for subdirectory bootstrap fix.

* slingshot: Sync with upstream.

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