Better solution know to the problem of the output
Merge pull request #265 from Zentyal/jjgarcia/improving-test-script

Better solution now to the problem of the output
Merge branch 'master' into jag/unit-test-fixes

Conflicts:
	extra/scripts/zentyal-unit-tests