Merged in revision 418548 from trunk since that was needed for the stomp backport http://issues.apache.org/activemq/browse/AMQ-793