Updated to JUnit 4.11.

Since it does not contain Hamcrest any more, we don't have to use
'junit-dep' any more.
Merge branch 'master' into master-jdk6