Patch for SM-1268

[Ulhas Bhole]

I have attached the patch for SM-1268 in JIRA[1]. I would appreciate if
someone can commit it to fix the test failures.

Regards,

Ulhas Bhole

[1] https://issues.apache.org/activemq/browse/SM-1268