fixes for: https://issues.apache.org/jira/browse/AMQ-4160 Fixed the code to properly handle the active events adds and remove. Disable one of the test cases because the fixed code now invalidates that test case.