Revert back: junit 4.11 as our build.xml needs more checking, no time
now.