Merge pull request #1515 from clebertsuconic/2.2.eap5

HORNETQ-1231 make listDeliveringdMessagesAsJSON to show messages even if they are on the TX state
Merge pull request #1518 from clebertsuconic/2.2.eap5

2.2.eap5