fix for: https://issues.apache.org/jira/browse/AMQ-3278 fox for: https://issues.apache.org/jira/browse/AMQ-3271