Merge from gnulib, improving some licensing wording.