Upgrade to junit 4.11 which no longer bundles hamcrest so that we no longer have to use junit-dep
Merge pull request #971 from benmccann/master

Upgrade to junit 4.11