Merge pull request #1654 from jbertram/2.2.eap5

HORNETQ-1313 - Resource adapter leaks connections
HORNETQ-1370 - Setting String property to null on a Message breaks XMLExporter tool