Revert to junit 4.11 due to incompatibility with powermock 1.6.0.
Merge remote-tracking branch 'origin/master'