On travis there are differences in CRs for some reason

This commit strips CRs from *.ok files and test output. Test failure used to be 
not recognized due to pipe: `cat -v` always succeeds meaning that `if ! diff 
… | cat -v` always succeeds too.
Merge branch 'fix-functional-tests-diff' into develop