Updated to JUnit4, which seems to have fixed intermittent failures.  See AMQ-4980