Travis build: fix junit-errors-to-stdout.sh script
Merge branch '3.x'