update for: https://issues.apache.org/jira/browse/AMQ-4123 make the test use the Wait condition instead of hard sleeps