* bootstrap: Merge in changes from gnulib.