The fix itself works, but causes problems in other cases so back it
out for now.
Reopens#2228
This reverts commit 82ee2f8cd4.
This reverts commit 0f0d7cb00d.
Use makefiles instead of a make.sh script
Expected results are in individual .stderr files instead of the expected.log file
Add errors test-suite to Travis testing and 'make check'