Merge pull request #4310 from daverodgman/check-names-grep-backport-2.16

Backport 2.16: Make check-names.sh accept any grep