https://issues.apache.org/jira/browse/AMQ-3958 - fix up for current and next few versions, highlight in the release guide