[Bug 225954] Merge Review: junit