change for https://issues.apache.org/jira/browse/AMQ-3467 fix and issue created when the new changes were merged.