See AMQ-4886.  Updated tearDown so it can't hang, reduced timeouts, updated to JUnit4