Github user clebertsuconic commented on the issue:
https://github.com/apache/activemq-artemis/pull/2467
@michaelandrepearce / @franz1981 all done.
I squashed my commits. It was hard to keep them separated due to these
changes being inter-related.---
