Adding test and fix for https://issues.apache.org/jira/browse/AMQ-3140 using included patch with modifications.