Github user clebertsuconic commented on the issue:
https://github.com/apache/activemq-artemis/pull/2293
@andytaylor Cherry-pick on this doesn't work. Quite a few conflicts.
You have two options:
I - you do the cherry-pick yourself:
```
git checkout 2.6.x
git cherry-pick -x 3b34127bb3ce6720ff794551a2877ba9794f0960
```
resolve the conflits yourself:
```
git push apache 2.6.x
```
or II:
Do the cherry-pick like I, and send a pull request into 2.6.x. at that
point it would be a simple merge.
I would prefer I, as Pull Requests don't automatically close unless it's a
simple merge (no rebase involved).
---
