Imported Upstream version 2.4.2
Merge tag 'upstream/2.4.2'

Upstream version 2.4.2
drop tests_Cat-err-file-in-case-of-error.patch included upstream
disable assembler optimizations on armel to fix test failures
prepare for upload