Rewrite grepccmsg() so it takes the file-contents rather than the file-name.
Rewrite grepnonfatal() to use the file-contents rather than the file-name.
Merge branch 'master' of ssh://github.com/abeltje/Test-Smoke