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

Make check-names.sh accept any grep