Merge pull request #16682 from poettering/userdb-gecos-fix