bootstrap: sync with upstream.

This revision fixes some small bugs, and is compatible with
non-gnu awk and non-gnu sed again.
* bootstrap: sync with upstream.
Merge pull request #51 from gvvaughan/pull-request/sync-upstream-bootstrap

bootstrap: sync with upstream.