Merge upstream 4.2.1
Drop patches merged upstream or no longer used
Next release will be 4.2.1
Next release will be 4.2.1
Don't forget the English manpage for groupmems