Merge pull request #4308 from daverodgman/checknames-grep

Forwardport 3.0: Make check-names.sh accept FreeBSD grep