Merge pull request #1073 from clebertsuconic/master-fix

some BZ fixes. small changes.
Bug 965093/HORNETQ-1206 : Thread leak test failure with IBM JRE