https://issues.apache.org/jira/browse/AMQ-4995 - more fixes