Revert "Bug 409575 - Failure in SFS build, missing org.junit" This reverts commit 3314d4d6a0962a0e0058be388a245d3c8640dbdf.