DNM: Fixes to get "make check" run on SUSE v2

Updated version of pull request #2018.

The first commit is needed to fix issue with correct tab escaping in bash grep command. For an example see: https://gist.github.com/dalgaaf/2abed277f9f00ff1cdd5