Implemented a few changes suggested in patch set 3 of commit 86355

Also fixed link to CREDITS file.

https://gerrit.wikimedia.org/r/#/c/86355/
Bug: 49313