Update to junit-4.11 & maven-surefire-plugin-2.16