slingshot: sync with upstream.

* slingshot: Sync with upstream for grep GNUism fix.
* bootstrap.conf (buildreq): Don't set a git version number, or
else `GIT=true ./bootstrap` doesn't work!

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