Migrate to junit 4.11

Removes the version override and drags tests into 4.11. Also reverts
29ad7ba749eac80e6514b1ca37aa850c30649b55 for a proper fix.

Change-Id: I981163ee2c1d036ab04331eeba36f24a7e6f8002
Signed-off-by: Robert Varga <rovarga@cisco.com>
Merge "Migrate to junit 4.11"